Update start.sh

start.sh

@@ -13,19 +13,18 @@ PLUGIN_DIR="$BACKEND_DIR/plugins"
 
 mkdir -p "$PLUGIN_DIR"
 
-HF_BUCKET_HANDLE="hf://buckets/smodusermc/mc"
-SAVE_DIRS="world world_nether world_the_end players banned-ips.json banned-players.json ops.json whitelist.json"
+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 plugins"
 SYNC_INTERVAL="${SYNC_INTERVAL:-300}"
-
 IDLE_MODE=false
 
 # =============================================
-# OP ACCOUNT — set your username here
+# OP ACCOUNT
 # =============================================
 OP_USERNAME="CreppyBitch"
 
 CPU_CORES=$(nproc 2>/dev/null || echo 2)
-NETTY_THREADS=$CPU_CORES
+NETTY_THREADS=4
 
 TOTAL_MEM_MB=$(free -m | awk '/^Mem:/{print $2}')
 BUNGEE_MAX_MB=1024
@@ -35,7 +34,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 +43,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 synced: WorldEdit, WorldGuard, MineResetLite, Shopkeepers, SafeTrade, Skript, PvPManager"
 echo ""
 
 # =============================================
-# JVM FLAGS — no GC thread limits
+# JVM FLAGS
 # =============================================
 PAPER_JVM_FLAGS=(
     -Xmx${PAPER_MAX_MB}M
@@ -111,7 +111,7 @@ BUNGEE_JVM_FLAGS=(
 )
 
 # =============================================================
-# RCON
+# RCON — each command sent individually to avoid mangling
 # =============================================================
 RCON_PASS="chunkystart"
 
@@ -122,7 +122,9 @@ get_player_count() {
 }
 
 mc_command() {
-    mcrcon -H 127.0.0.1 -P 25575 -p "$RCON_PASS" "$@" 2>/dev/null
+    for cmd in "$@"; do
+        mcrcon -H 127.0.0.1 -P 25575 -p "$RCON_PASS" "$cmd" 2>/dev/null
+    done
 }
 
 # =============================================================
@@ -161,24 +163,42 @@ setup_op_account() {
 OPEOF
     echo "   ops.json written (level 4, UUID: ${V3_UUID})"
 
-    mc_command "op ${OP_USERNAME}" 2>/dev/null
+    mc_command "op ${OP_USERNAME}"
     echo "   RCON op command sent"
 }
 
 # =============================================================
-# IDLE MODE
+# IDLE MODE — safe version that does NOT kill entities
 # =============================================================
 enter_idle_mode() {
     [ "$IDLE_MODE" = true ] && return
     IDLE_MODE=true
-    mc_command "gamerule randomTickSpeed 0" "gamerule doMobSpawning false" "kill @e[type=!Player]"
-    echo "[IDLE] Active"
+    mc_command "gamerule randomTickSpeed 0"
+    mc_command "gamerule doMobSpawning false"
+    mc_command "kill @e[type=Zombie]"
+    mc_command "kill @e[type=Skeleton]"
+    mc_command "kill @e[type=Spider]"
+    mc_command "kill @e[type=Creeper]"
+    mc_command "kill @e[type=Enderman]"
+    mc_command "kill @e[type=Witch]"
+    mc_command "kill @e[type=Slime]"
+    mc_command "kill @e[type=CaveSpider]"
+    mc_command "kill @e[type=Silverfish]"
+    mc_command "kill @e[type=Guardian]"
+    mc_command "kill @e[type=Endermite]"
+    mc_command "kill @e[type=Blaze]"
+    mc_command "kill @e[type=Ghast]"
+    mc_command "kill @e[type=MagmaCube]"
+    mc_command "kill @e[type=WitherSkeleton]"
+    mc_command "kill @e[type=ZombiePigman]"
+    echo "[IDLE] Active — hostile mobs cleared, ticks paused"
 }
 
 exit_idle_mode() {
     [ "$IDLE_MODE" = false ] && return
     IDLE_MODE=false
-    mc_command "gamerule randomTickSpeed 3" "gamerule doMobSpawning true"
+    mc_command "gamerule randomTickSpeed 3"
+    mc_command "gamerule doMobSpawning true"
     echo "[IDLE] Gameplay restored"
 }
 
@@ -235,7 +255,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 +276,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 +285,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,33 +296,35 @@ done
 echo ""
 
 # =============================================================
-# STEP 2: Start WindSpigot
+# STEP 2: Core server configs + Start WindSpigot
 # =============================================================
 cd "$BACKEND_DIR"
 echo "eula=true" > eula.txt
 
+echo "[2/7] Writing core server configs + starting WindSpigot..."
+
 cat > server.properties << 'EOF'
 server-port=25565
 server-ip=127.0.0.1
 online-mode=false
 spawn-protection=0
-max-players=10
-view-distance=4
+max-players=20
+view-distance=6
 gamemode=0
-difficulty=2
+difficulty=1
 level-name=world
-level-type=DEFAULT
+level-type=FLAT
 level-seed=8678942899319966093
 generate-structures=true
-motd=Eaglercraft Server
+motd=DigPvP Eaglercraft
 pvp=true
 allow-flight=false
 white-list=false
 spawn-npcs=true
-spawn-animals=true
-spawn-monsters=true
-enable-command-block=true
-allow-nether=true
+spawn-animals=false
+spawn-monsters=false
+enable-command-block=false
+allow-nether=false
 use-native-transport=true
 network-compression-threshold=-1
 entity-broadcast-range-percentage=50
@@ -393,7 +418,8 @@ settings:
   reduced-chunk-loads: true
   lag-compensated-potions: false
   anti-xray:
-    enabled: false
+    enabled: true
+    engine-mode: 2
   hit-detection:
     enabled: true
     threshold: 1.0
@@ -415,15 +441,12 @@ settings:
   stop-notify-bungee: true
   anti-malware: true
   use-tcp-nodelay: true
-  brand-name: "Survival"
+  brand-name: "PVP"
 EOF
 
-# Write ops.json before server starts
 setup_op_account
 
-echo "[2/6] Starting WindSpigot (--noconsole to fix CPU bug)..."
 > /tmp/paper.log
-
 start_windspigot
 echo " WindSpigot PID: $BACKEND_PID"
 
@@ -446,38 +469,49 @@ for i in $(seq 1 30); do
     sleep 1
 done
 
-# Send OP command via RCON as backup
 if [ -n "$OP_USERNAME" ]; then
     mc_command "op ${OP_USERNAME}"
     echo " OP granted to ${OP_USERNAME} via RCON"
 fi
 
 echo ""
-echo " === PLUGINS ==="
+echo " === PLUGINS LOADED ==="
 grep -i "Enabling" /tmp/paper.log | grep -oP "Enabling \K[^\s]+" 2>/dev/null | while read p; do
     echo "   - $p"
 done
-echo " ==============="
+echo " ======================"
 echo ""
 
 # =============================================================
-# STEP 3: Skip CPU check (removed)
+# STEP 3: PVP gamerules — each command sent separately
 # =============================================================
-echo "[3/6] Skipping CPU check..."
+echo "[3/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 4: Idle mode — safe version
 # =============================================================
-echo "[4/6] Applying idle mode (no players)..."
-mc_command "gamerule randomTickSpeed 0" "gamerule doMobSpawning false" "kill @e[type=!Player]"
-IDLE_MODE=true
+echo "[4/7] Applying idle mode (no players)..."
+enter_idle_mode
 echo ""
 
 # =============================================================
-# STEP 5: BungeeCord
+# STEP 5: Write BungeeCord config
 # =============================================================
-echo "[5/6] BungeeCord config..."
+echo "[5/7] Writing BungeeCord config..."
+
+# ===============================
+# BUNGEE CONFIG
+# ===============================
 cd "$BUNGEE_DIR"
 
 cat > config.yml << 'EOF'
@@ -498,12 +532,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
@@ -527,11 +561,22 @@ connection_throttle_limit: 0
 stats: none
 log_pings: false
 EOF
+echo "   BungeeCord config.yml written"
+
+echo ""
+echo "   Reloading server via RCON..."
+sleep 2
+mc_command "reload confirm"
+echo "   Full server reload done"
+echo ""
 
+# =============================================================
+# STEP 6: EaglerXBungee generation + Start BungeeCord
+# =============================================================
 LISTENERS_FILE=$(find_listeners_yml)
 
 if [ -z "$LISTENERS_FILE" ]; then
-    echo "[6/6] Generating EaglerXBungee config..."
+    echo "[6/7] Generating EaglerXBungee config..."
     cd "$BUNGEE_DIR"
     $JAVA "${BUNGEE_JVM_FLAGS[@]}" \
         -cp "sqlite-jdbc.jar:BungeeCord.jar" \
@@ -560,14 +605,30 @@ if [ -z "$LISTENERS_FILE" ]; then
     done
     sleep 2
 else
-    echo "[6/6] EaglerXBungee config exists"
+    echo "[6/7] EaglerXBungee config exists"
 fi
 
 echo " Starting BungeeCord..."
 
 patch_eagler_port
 
+# === NEW: MOTD AND ICON PATCH ===
+LISTENERS_NOW=$(find_listeners_yml)
+if [ -n "$LISTENERS_NOW" ]; then
+    # Title: &k!!&r &6&l⚔ DIG PVP ⚔ &r&6&k!!&r
+    # Subtitle: &r&7Mine ores, buy gear, fight!
+    sed -i 's/An EaglercraftX server/\&k!!\&r \&6\&l⚔ DIG PVP ⚔ \&r\&6\&k!!\&r/g' "$LISTENERS_NOW"
+    sed -i 's/EaglercraftX proxy/\&r\&7Mine ores, buy gear, fight!/g' "$LISTENERS_NOW"
+fi
+
+# Copy the server icon from your HuggingFace bucket to BungeeCord
+if [ -f "$BACKEND_DIR/server-icon.png" ]; then
+    cp -f /opt/server/bungee/server-icon.png "$BUNGEE_DIR/server-icon.png"
+fi
+# ================================
+
 EAGLER_DIR=$(dirname "$(find_listeners_yml)" 2>/dev/null)
+
 if [ -n "$EAGLER_DIR" ]; then
     mkdir -p "$EAGLER_DIR/drivers"
     cp -f "$BUNGEE_DIR/sqlite-jdbc.jar" "$EAGLER_DIR/drivers/sqlite-jdbc.jar" 2>/dev/null
@@ -595,8 +656,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 Synced via HuggingFace!"
     echo "============================================"
 else
     echo " Port 7860 NOT open!"
@@ -615,6 +677,17 @@ else
     fi
 fi
 
+# =============================================================
+# STEP 7: Final confirmation
+# =============================================================
+echo ""
+echo "[7/7] Final status check..."
+echo " === ACTIVE PLUGINS ==="
+RELOAD_CHECK=$(mc_command "plugins")
+echo "   $RELOAD_CHECK"
+echo " ======================"
+echo ""
+
 # =============================================================
 # Sync loop
 # =============================================================
@@ -622,14 +695,22 @@ hf_sync_loop &
 SYNC_PID=$!
 
 # =============================================================
-# Shutdown
+# Shutdown — save world properly, then push, then stop processes
 # =============================================================
 graceful_shutdown() {
     echo " Shutting down..."
-    mc_command "gamerule doMobSpawning true" "gamerule randomTickSpeed 3" "save-all"
+    mc_command "gamerule doMobSpawning true"
+    mc_command "gamerule randomTickSpeed 3"
+    mc_command "save-all"
     sleep 5
     hf_push_saves
-    kill $SYNC_PID $BACKEND_PID $BUNGEE_PID 2>/dev/null
+    kill $SYNC_PID 2>/dev/null
+    # Stop the MC server gracefully via RCON before killing PIDs
+    mc_command "stop"
+    sleep 5
+    kill $BUNGEE_PID 2>/dev/null
+    # Only force-kill if still alive
+    kill -0 $BACKEND_PID 2>/dev/null && kill $BACKEND_PID 2>/dev/null
     exit 0
 }
 
@@ -653,10 +734,17 @@ while true; do
         IDLE_MODE=false
         start_windspigot
         sleep 45
-        # Re-OP after restart
+        # Wait for RCON to be available before sending commands
+        for i in $(seq 1 30); do
+            nc -z 127.0.0.1 25575 2>/dev/null && break
+            sleep 1
+        done
         if [ -n "$OP_USERNAME" ]; then
-            mc_command "op ${OP_USERNAME}" 2>/dev/null
+            mc_command "op ${OP_USERNAME}"
         fi
+        mc_command "gamerule pvp true"
+        mc_command "gamerule keepInventory false"
+        mc_command "gamerule mobGriefing false"
         enter_idle_mode
     fi