Update start.sh

start.sh

@@ -14,13 +14,14 @@ PLUGIN_DIR="$BACKEND_DIR/plugins"
 mkdir -p "$PLUGIN_DIR"
 
 HF_BUCKET_HANDLE="hf://buckets/smodusermc/digpvp"
-SAVE_DIRS="world world_nether world_the_end players banned-ips.json banned-players.json ops.json whitelist.json"
+# Plugin data directories included for persistence
+SAVE_DIRS="world world_nether world_the_end players banned-ips.json banned-players.json ops.json whitelist.json plugins/WorldGuard plugins/Shopkeepers plugins/MineResetLite plugins/SafeTrade plugins/Skript plugins/WorldEdit"
 SYNC_INTERVAL="${SYNC_INTERVAL:-300}"
 
 IDLE_MODE=false
 
 # =============================================
-# OP ACCOUNT — set your username here
+# OP ACCOUNT
 # =============================================
 OP_USERNAME="CreppyBitch"
 
@@ -35,7 +36,7 @@ PAPER_MAX_MB=$(( TOTAL_MEM_MB - BUNGEE_MAX_MB - 768 ))
 PAPER_MIN_MB=8192
 
 echo "========================================"
-echo "  Eaglercraft 1.8.8 Survival"
+echo "  Eaglercraft 1.8.8 PVP Server"
 echo "  WindSpigot + HuggingFace Buckets"
 echo "========================================"
 echo ""
@@ -44,10 +45,11 @@ echo " Server: ${PAPER_MIN_MB}-${PAPER_MAX_MB}MB | Bungee: ${BUNGEE_MAX_MB}MB"
 echo " Java: $($JAVA -version 2>&1 | head -1)"
 echo " Bucket: $HF_BUCKET_HANDLE"
 [ -n "$OP_USERNAME" ] && echo " OP Account: $OP_USERNAME"
+echo " Plugins: WorldEdit, WorldGuard, MineResetLite, Shopkeepers, SafeTrade, Skript"
 echo ""
 
 # =============================================
-# JVM FLAGS — no GC thread limits
+# JVM FLAGS
 # =============================================
 PAPER_JVM_FLAGS=(
     -Xmx${PAPER_MAX_MB}M
@@ -235,7 +237,10 @@ hf_push_saves() {
     local STAGING="/tmp/hf-staging"
     rm -rf "$STAGING" && mkdir -p "$STAGING"
     for item in $SAVE_DIRS; do
-        [ -e "$BACKEND_DIR/$item" ] && cp -a "$BACKEND_DIR/$item" "$STAGING/$item"
+        if [ -e "$BACKEND_DIR/$item" ]; then
+            mkdir -p "$STAGING/$(dirname "$item")"
+            cp -a "$BACKEND_DIR/$item" "$STAGING/$item"
+        fi
     done
     hf buckets sync "$STAGING" "${HF_BUCKET_HANDLE}/game-data" --delete 2>&1 | tail -3
     [ $? -eq 0 ] && echo "[SYNC] OK $(date '+%H:%M:%S')" \
@@ -253,7 +258,7 @@ hf_sync_loop() {
 # =============================================================
 # STEP 0: Bucket
 # =============================================================
-echo "[0/6] Bucket setup..."
+echo "[0/7] Bucket setup..."
 hf_authenticate
 hf_ensure_bucket
 hf_restore_saves
@@ -262,7 +267,7 @@ echo ""
 # =============================================================
 # STEP 1: World size
 # =============================================================
-echo "[1/6] World analysis..."
+echo "[1/7] World analysis..."
 for WORLD_DIR in world world_nether world_the_end; do
     if [ -d "$BACKEND_DIR/$WORLD_DIR" ]; then
         SIZE=$(du -sh "$BACKEND_DIR/$WORLD_DIR" 2>/dev/null | awk '{print $1}')
@@ -273,11 +278,14 @@ done
 echo ""
 
 # =============================================================
-# STEP 2: Start WindSpigot
+# STEP 2: Write ALL configs + plugin configs before boot
 # =============================================================
 cd "$BACKEND_DIR"
 echo "eula=true" > eula.txt
 
+echo "[2/7] Writing all server + plugin configs..."
+
+# ---- server.properties (PVP) ----
 cat > server.properties << 'EOF'
 server-port=25565
 server-ip=127.0.0.1
@@ -291,7 +299,7 @@ level-name=world
 level-type=DEFAULT
 level-seed=8678942899319966093
 generate-structures=true
-motd=Eaglercraft Server
+motd=Eaglercraft PVP Server
 pvp=true
 allow-flight=false
 white-list=false
@@ -309,6 +317,7 @@ rcon.port=25575
 rcon.password=chunkystart
 EOF
 
+# ---- bukkit.yml ----
 cat > bukkit.yml << 'EOF'
 settings:
   allow-end: true
@@ -329,6 +338,7 @@ ticks-per:
   autosave: 12000
 EOF
 
+# ---- spigot.yml (PVP tuned) ----
 cat > spigot.yml << 'EOF'
 config-version: 8
 settings:
@@ -375,6 +385,7 @@ world-settings:
     enable-zombie-pigmen-portal-spawns: false
 EOF
 
+# ---- windspigot.yml (PVP combat tuned) ----
 cat > windspigot.yml << 'EOF'
 settings:
   async:
@@ -410,18 +421,467 @@ settings:
     players-per-thread: 25
 EOF
 
+# ---- nacho.yml ----
 cat > nacho.yml << 'EOF'
 settings:
   stop-notify-bungee: true
   anti-malware: true
   use-tcp-nodelay: true
-  brand-name: "Survival"
+  brand-name: "PVP"
 EOF
 
+# =============================================================
+# PLUGIN CONFIGS — written before server starts so plugins
+# find them on first boot and don't overwrite with defaults
+# =============================================================
+
+# ---- WorldEdit ----
+mkdir -p "$PLUGIN_DIR/WorldEdit"
+cat > "$PLUGIN_DIR/WorldEdit/config.yml" << 'WEEOF'
+limits:
+  allow-extra-data-values: false
+  max-blocks-changed:
+    default: 5000
+    maximum: 50000
+  max-polygonal-points:
+    default: -1
+    maximum: 20
+  max-radius: -1
+  max-super-pickaxe-size: 5
+  max-brush-radius: 6
+  butcher-radius:
+    default: -1
+    maximum: -1
+  disallowed-blocks: []
+use-inventory:
+  enable: false
+  allow-override: true
+  creative-mode-overrides: false
+logging:
+  log-commands: false
+  file: worldedit.log
+super-pickaxe:
+  drop-items: true
+  many-drop-items: true
+snapshots:
+  directory:
+navigation-wand:
+  item: 345
+  max-distance: 100
+scripting:
+  timeout: 3000
+  dir: craftscripts
+saving:
+  dir: schematics
+files:
+  allow-symbolic-links: false
+history:
+  size: 15
+  expiration: 10
+wand-item: 271
+no-double-slash: false
+no-op-permissions: false
+debug: false
+show-help-on-first-use: true
+server-side-cui: true
+WEEOF
+echo "   WorldEdit config written"
+
+# ---- WorldGuard ----
+mkdir -p "$PLUGIN_DIR/WorldGuard"
+cat > "$PLUGIN_DIR/WorldGuard/config.yml" << 'WGEOF'
+op-permissions: true
+summary-on-start: true
+auto-invincible: false
+auto-invincible-group: false
+auto-no-drowning-group: false
+use-player-move-event: true
+use-player-teleport-event: true
+regions:
+  enable: true
+  wand: 287
+  max-region-count-per-player:
+    default: 7
+  claim-only-inside-existing-regions: false
+  max-claim-volume: 30000
+  cancel-chat-without-recipients: false
+  npc-flag-handling: RELATIONSHIP_API
+  use-creature-spawn-event: true
+  invincibility-removes-mobs: false
+  high-frequency-flags: true
+  protect-against-liquid-flow: false
+sql:
+  use: false
+  dsn: jdbc:mysql://localhost/worldguard
+  username: worldguard
+  password: worldguard
+  table-prefix: ''
+  driver: ''
+build-permission-nodes:
+  enable: false
+  deny-message: '&cSorry, you cannot build here!'
+event-handling:
+  block-entity-spawns-with-mob-reasons: false
+  interaction-whitelist: []
+security:
+  deop-everyone-on-join: false
+  block-in-game-op-command: false
+mobs:
+  block-creeper-explosions: false
+  block-creeper-block-damage: true
+  block-wither-explosions: false
+  block-wither-block-damage: true
+  block-wither-skull-explosions: false
+  block-wither-skull-block-damage: true
+  block-enderdragon-block-damage: true
+  block-enderdragon-portal-creation: false
+  block-fireball-explosions: false
+  block-fireball-block-damage: true
+  anti-wolf-dumbness: false
+  allow-tamed-spawns: true
+  disable-enderman-griefing: true
+  block-painting-destroy: false
+  block-item-frame-destroy: false
+  block-plugin-spawning: true
+  block-above-ground-slimes: false
+  block-other-explosions: false
+  block-zombie-door-destruction: true
+  block-vehicle-entry: false
+  block-creature-spawn: []
+player-damage:
+  disable-fall-damage: false
+  disable-lava-damage: false
+  disable-fire-damage: false
+  disable-lightning-damage: false
+  disable-drowning-damage: false
+  disable-suffocation-damage: false
+  disable-contact-damage: false
+  disable-void-damage: false
+  teleport-on-void-falling: false
+  disable-explosion-damage: false
+  disable-mob-damage: false
+  disable-death-messages: false
+ignition:
+  block-tnt: false
+  block-tnt-block-damage: false
+  block-lighter: false
+fire:
+  disable-lava-fire-spread: false
+  disable-all-fire-spread: false
+  disable-fire-spread-blocks: []
+  lava-spread-blocks: []
+weather:
+  prevent-lightning-strike-fire: false
+  disable-lightning-strike-fire: false
+  disable-thunderstorm: false
+  disable-weather: false
+  disable-pig-zombification: false
+  disable-powered-creepers: false
+  always-raining: false
+  always-thundering: false
+dynamics:
+  disable-mushroom-spread: false
+  disable-ice-melting: false
+  disable-snow-melting: false
+  disable-snow-formation: false
+  disable-ice-formation: false
+  disable-leaf-decay: false
+  disable-grass-growth: false
+  disable-mycelium-spread: false
+  disable-vine-growth: false
+  disable-crop-growth: false
+  disable-soil-dehydration: false
+chest-protection:
+  enable: false
+  disable-off-check: false
+blacklist:
+  use: false
+  override-wildcard: true
+  log:
+    console: false
+    database: false
+    file: false
+    file-path: worldguard/logs/%Y-%m-%d.log
+WGEOF
+
+mkdir -p "$PLUGIN_DIR/WorldGuard/worlds/world"
+cat > "$PLUGIN_DIR/WorldGuard/worlds/world/config.yml" << 'WGWEOF'
+regions:
+  enable: true
+  invincibility-removes-mobs: false
+mobs:
+  block-creeper-block-damage: true
+  block-enderdragon-block-damage: true
+  block-wither-block-damage: true
+  disable-enderman-griefing: true
+  block-zombie-door-destruction: true
+player-damage:
+  disable-fall-damage: false
+  disable-void-damage: false
+fire:
+  disable-all-fire-spread: false
+weather:
+  disable-weather: false
+WGWEOF
+echo "   WorldGuard config written"
+
+# ---- MineResetLite ----
+mkdir -p "$PLUGIN_DIR/MineResetLite"
+mkdir -p "$PLUGIN_DIR/MineResetLite/mines"
+cat > "$PLUGIN_DIR/MineResetLite/config.yml" << 'MRLEOF'
+broadcast-in-world-only: false
+broadcast-nearby-only: false
+default-mine-reset-delay: 15
+MRLEOF
+echo "   MineResetLite config written"
+
+# ---- Shopkeepers ----
+mkdir -p "$PLUGIN_DIR/Shopkeepers"
+cat > "$PLUGIN_DIR/Shopkeepers/config.yml" << 'SKEOF'
+debug: false
+enable-metrics: false
+bypass-spawn-blocking: true
+bypass-shop-interaction-blocking: false
+save-instantly: true
+enable-living-shops: true
+disable-living-shops: false
+enable-sign-shops: true
+enable-citizen-shops: false
+name-regex: "[A-Za-z0-9 ]{3,25}"
+max-shops-per-player: 0
+require-creation-permission: false
+create-player-shop-with-command: false
+currency-item: EMERALD
+currency-item-spawn-egg-entity-type: ''
+zero-currency-item: AIR
+high-currency-item: EMERALD_BLOCK
+high-currency-value: 9
+high-currency-min-cost: 20
+zero-high-currency-item: AIR
+disable-other-villagers: true
+block-villager-spawns: false
+hire-other-villagers: false
+tax-rate: 0
+tax-round-up: false
+protect-chests: true
+prevent-item-movement: true
+delete-shopkeeper-on-break-chest: false
+editor-max-column: 8
+enable-villager-shops: true
+enable-sign-shops-only: false
+enable-witch-shops: true
+msg-creation-item-selected: "&aShop creation item selected."
+msg-shop-create-fail: "&cCannot create shop."
+msg-button-name: "&aNaming"
+msg-button-type: "&aType"
+msg-button-delete: "&4Delete"
+msg-button-hire: "&aHire"
+SKEOF
+echo "   Shopkeepers config written"
+
+# ---- SafeTrade ----
+mkdir -p "$PLUGIN_DIR/SafeTrade"
+cat > "$PLUGIN_DIR/SafeTrade/config.yml" << 'STEOF'
+enabled: true
+prefix: "&8[&6Trade&8] "
+allow-cross-world: true
+request-timeout: 30
+gui-title: "&8Safe Trade"
+money-trading: false
+log-trades: true
+log-file: "trades.log"
+sounds:
+  trade-request: true
+  trade-complete: true
+  trade-cancel: true
+messages:
+  trade-request-sent: "&aTrade request sent to &e%player%&a!"
+  trade-request-received: "&e%player% &awants to trade! Use &e/trade accept &ato accept."
+  trade-accepted: "&aTrade accepted!"
+  trade-denied: "&cTrade denied."
+  trade-cancelled: "&cTrade cancelled."
+  trade-complete: "&aTrade complete!"
+  no-pending-request: "&cYou have no pending trade requests."
+  already-trading: "&cYou are already in a trade."
+  cannot-trade-self: "&cYou cannot trade with yourself."
+  player-not-found: "&cPlayer not found."
+  player-busy: "&c%player% is busy."
+  request-expired: "&cTrade request expired."
+STEOF
+echo "   SafeTrade config written"
+
+# ---- Skript ----
+mkdir -p "$PLUGIN_DIR/Skript"
+mkdir -p "$PLUGIN_DIR/Skript/scripts"
+cat > "$PLUGIN_DIR/Skript/config.sk" << 'SKRIPTEOF'
+language: english
+color codes: true
+script loader:
+    use new script loader: true
+databases:
+    database 1:
+        type: CSV
+        pattern: .*
+        file: ./plugins/Skript/variables.csv
+        backup interval: 2 hours
+log:
+    verbosity: NORMAL
+enable effect commands: true
+allow function calls from expressions: true
+disable variable will not be saved warnings: false
+disable missing and/or warnings: false
+disable variable conflict warnings: false
+date format: default
+SKRIPTEOF
+echo "   Skript config written"
+
+# ---- PVP Skript: core ----
+cat > "$PLUGIN_DIR/Skript/scripts/pvp-core.sk" << 'PVPSKEOF'
+# ============================
+#  PVP Core — kills, streaks
+# ============================
+
+on death of player:
+    attacker is a player
+    add 1 to {kills::%attacker%}
+    add 1 to {deaths::%victim%}
+    set {lastKill::%attacker%} to now
+    send "&c&l☠ &e%victim% &7was slain by &c%attacker% &7(&e%{kills::%attacker%}% kills&7)" to all players
+
+on death of player:
+    attacker is a player
+    add 1 to {streak::%attacker%}
+    if {streak::%attacker%} is 5:
+        send "&6&l⚔ %attacker% &eis on a &c&l5 KILL STREAK!" to all players
+    if {streak::%attacker%} is 10:
+        send "&6&l⚔ %attacker% &eis on a &4&l10 KILL STREAK!" to all players
+
+on death of player:
+    set {streak::%victim%} to 0
+
+command /stats [<player>]:
+    trigger:
+        if arg-1 is set:
+            set {_target} to arg-1
+        else:
+            set {_target} to player
+        set {_k} to {kills::%{_target}%} ? 0
+        set {_d} to {deaths::%{_target}%} ? 0
+        send "&8&m                              "
+        send "&6&l⚔ &ePVP Stats for &c%{_target}%"
+        send "&7Kills: &a%{_k}%"
+        send "&7Deaths: &c%{_d}%"
+        send "&7Streak: &e%{streak::%{_target}%} ? 0%"
+        send "&8&m                              "
+
+on respawn:
+    wait 1 tick
+    give player iron sword named "&7PVP Sword"
+    give player 16 of cooked beef named "&6Steak"
+    give player iron helmet
+    give player iron chestplate
+    give player iron leggings
+    give player iron boots
+
+on first join:
+    give player iron sword named "&7PVP Sword"
+    give player 16 of cooked beef named "&6Steak"
+    give player iron helmet
+    give player iron chestplate
+    give player iron leggings
+    give player iron boots
+    give player wooden pickaxe
+    send "&a&lWelcome to the PVP Server!" to player
+    send "&7Use &e/stats &7to check your kills and deaths." to player
+    send "&7Use &e/trade <player> &7to trade items safely." to player
+
+on join:
+    set join message to "&8[&a+&8] &7%player%"
+
+on quit:
+    set quit message to "&8[&c-&8] &7%player%"
+
+command /spawn:
+    trigger:
+        teleport player to spawn of world "world"
+        send "&aTeleported to spawn!"
+PVPSKEOF
+echo "   Skript pvp-core.sk written"
+
+# ---- PVP Skript: spawn protection ----
+cat > "$PLUGIN_DIR/Skript/scripts/spawn-protect.sk" << 'SPAWNEOF'
+on damage of player:
+    attacker is a player
+    distance between victim's location and spawn of world "world" is less than 20
+    cancel event
+    send "&cNo PVP in spawn area!" to attacker
+SPAWNEOF
+echo "   Skript spawn-protect.sk written"
+
+# ---- PVP Skript: combat tag ----
+cat > "$PLUGIN_DIR/Skript/scripts/combat-tag.sk" << 'COMBATEOF'
+on damage of player:
+    attacker is a player
+    set {combatTag::%victim%} to now
+    set {combatTag::%attacker%} to now
+    send "&c&l⚔ You are now in combat! Don't log out!" to victim
+    send "&c&l⚔ You are now in combat! Don't log out!" to attacker
+
+on quit:
+    {combatTag::%player%} is set
+    difference between now and {combatTag::%player%} is less than 15 seconds
+    kill player
+    broadcast "&c%player% combat logged and was killed!"
+
+every 1 second:
+    loop all players:
+        {combatTag::%loop-player%} is set
+        difference between now and {combatTag::%loop-player%} is greater than 15 seconds
+        delete {combatTag::%loop-player%}
+COMBATEOF
+echo "   Skript combat-tag.sk written"
+
+# ---- PVP Skript: emerald economy ----
+cat > "$PLUGIN_DIR/Skript/scripts/economy.sk" << 'ECONEOF'
+command /balance [<player>]:
+    aliases: /bal, /money
+    trigger:
+        if arg-1 is set:
+            set {_target} to arg-1
+        else:
+            set {_target} to player
+        set {_emeralds} to number of emeralds in {_target}'s inventory
+        send "&8&m                              "
+        send "&6&l$ &eBalance for &c%{_target}%"
+        send "&7Emeralds: &a%{_emeralds}%"
+        send "&8&m                              "
+
+command /pay <player> <integer>:
+    trigger:
+        if arg-2 is less than 1:
+            send "&cAmount must be at least 1!"
+            stop
+        if arg-1 is player:
+            send "&cYou can't pay yourself!"
+            stop
+        set {_has} to number of emeralds in player's inventory
+        if {_has} is less than arg-2:
+            send "&cYou don't have enough emeralds!"
+            stop
+        remove arg-2 of emerald from player's inventory
+        give arg-2 of emerald to arg-1
+        send "&aSent &e%arg-2% emeralds &ato &e%arg-1%&a!"
+        send "&a%player% &esent you &a%arg-2% emeralds&e!" to arg-1
+ECONEOF
+echo "   Skript economy.sk written"
+
+echo "   All configs written!"
+echo ""
+
 # Write ops.json before server starts
 setup_op_account
 
-echo "[2/6] Starting WindSpigot (--noconsole to fix CPU bug)..."
+echo "[3/7] Starting WindSpigot (--noconsole to fix CPU bug)..."
 > /tmp/paper.log
 
 start_windspigot
@@ -461,23 +921,32 @@ echo " ==============="
 echo ""
 
 # =============================================================
-# STEP 3: Skip CPU check (removed)
+# STEP 4: PVP gamerules via RCON
 # =============================================================
-echo "[3/6] Skipping CPU check..."
+echo "[4/7] Setting PVP gamerules..."
+mc_command "gamerule pvp true"
+mc_command "gamerule keepInventory false"
+mc_command "gamerule naturalRegeneration true"
+mc_command "gamerule doFireTick true"
+mc_command "gamerule mobGriefing false"
+mc_command "gamerule announceAdvancements false"
+mc_command "difficulty 2"
+mc_command "defaultgamemode survival"
+echo " PVP gamerules set"
 echo ""
 
 # =============================================================
-# STEP 4: Apply idle mode
+# STEP 5: Apply idle mode (no players initially)
 # =============================================================
-echo "[4/6] Applying idle mode (no players)..."
+echo "[5/7] Applying idle mode (no players)..."
 mc_command "gamerule randomTickSpeed 0" "gamerule doMobSpawning false" "kill @e[type=!Player]"
 IDLE_MODE=true
 echo ""
 
 # =============================================================
-# STEP 5: BungeeCord
+# STEP 6: BungeeCord
 # =============================================================
-echo "[5/6] BungeeCord config..."
+echo "[6/7] BungeeCord config..."
 cd "$BUNGEE_DIR"
 
 cat > config.yml << 'EOF'
@@ -498,12 +967,12 @@ disabled_commands:
   - disabledcommandhere
 servers:
   lobby:
-    motd: '&aEaglercraft Survival'
+    motd: '&aEaglercraft PVP'
     address: 127.0.0.1:25565
     restricted: false
 listeners:
   - query_port: 25577
-    motd: '&6Eaglercraft 1.8.8'
+    motd: '&6Eaglercraft 1.8.8 PVP'
     tab_list: GLOBAL_PING
     query_enabled: false
     proxy_protocol: false
@@ -531,7 +1000,7 @@ EOF
 LISTENERS_FILE=$(find_listeners_yml)
 
 if [ -z "$LISTENERS_FILE" ]; then
-    echo "[6/6] Generating EaglerXBungee config..."
+    echo "[7/7] Generating EaglerXBungee config..."
     cd "$BUNGEE_DIR"
     $JAVA "${BUNGEE_JVM_FLAGS[@]}" \
         -cp "sqlite-jdbc.jar:BungeeCord.jar" \
@@ -560,7 +1029,7 @@ if [ -z "$LISTENERS_FILE" ]; then
     done
     sleep 2
 else
-    echo "[6/6] EaglerXBungee config exists"
+    echo "[7/7] EaglerXBungee config exists"
 fi
 
 echo " Starting BungeeCord..."
@@ -595,8 +1064,9 @@ done
 if [ "$PORT_READY" = true ]; then
     echo ""
     echo "============================================"
-    echo " SERVER READY — EaglerCraft on :7860"
+    echo " PVP SERVER READY — EaglerCraft on :7860"
     [ -n "$OP_USERNAME" ] && echo " OP: $OP_USERNAME (level 4)"
+    echo " Plugins: WE, WG, MRL, Shopkeepers, SafeTrade, Skript"
     echo "============================================"
 else
     echo " Port 7860 NOT open!"
@@ -653,10 +1123,12 @@ while true; do
         IDLE_MODE=false
         start_windspigot
         sleep 45
-        # Re-OP after restart
         if [ -n "$OP_USERNAME" ]; then
             mc_command "op ${OP_USERNAME}" 2>/dev/null
         fi
+        mc_command "gamerule pvp true"
+        mc_command "gamerule keepInventory false"
+        mc_command "gamerule mobGriefing false"
         enter_idle_mode
     fi