Update start.sh

start.sh

@@ -27,14 +27,16 @@ CPU_CORES=$(nproc 2>/dev/null || echo 2)
 NETTY_THREADS=4
 
 TOTAL_MEM_MB=$(free -m | awk '/^Mem:/{print $2}')
-BUNGEE_MAX_MB=1024
-PAPER_MAX_MB=$(( TOTAL_MEM_MB - BUNGEE_MAX_MB - 768 ))
-[ "$PAPER_MAX_MB" -gt 8192 ] && PAPER_MAX_MB=8192
+BUNGEE_MAX_MB=512
+PAPER_MAX_MB=$(( TOTAL_MEM_MB - BUNGEE_MAX_MB - 512 ))
+[ "$PAPER_MAX_MB" -gt 6144 ] && PAPER_MAX_MB=6144
 [ "$PAPER_MAX_MB" -lt 1024 ] && PAPER_MAX_MB=1024
-PAPER_MIN_MB=8192
+# FIX: Min should be less than or equal to max
+PAPER_MIN_MB=$(( PAPER_MAX_MB / 2 ))
+[ "$PAPER_MIN_MB" -lt 512 ] && PAPER_MIN_MB=512
 
 echo "========================================"
-echo "  Eaglercraft 1.8.8 PVP Server"
+echo "  Eaglercraft 1.8.8 Survival Server"
 echo "  WindSpigot + HuggingFace Buckets"
 echo "========================================"
 echo ""
@@ -43,27 +45,26 @@ 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
+# JVM FLAGS - Optimized for limited resources
 # =============================================
 PAPER_JVM_FLAGS=(
     -Xmx${PAPER_MAX_MB}M
     -Xms${PAPER_MIN_MB}M
     -XX:+UseG1GC
     -XX:+ParallelRefProcEnabled
-    -XX:MaxGCPauseMillis=25
+    -XX:MaxGCPauseMillis=50
     -XX:+UnlockExperimentalVMOptions
     -XX:+DisableExplicitGC
-    -XX:G1NewSizePercent=40
-    -XX:G1MaxNewSizePercent=50
+    -XX:G1NewSizePercent=30
+    -XX:G1MaxNewSizePercent=40
     -XX:G1HeapRegionSize=8M
-    -XX:G1ReservePercent=15
-    -XX:G1HeapWastePercent=10
-    -XX:G1MixedGCCountTarget=8
-    -XX:InitiatingHeapOccupancyPercent=60
+    -XX:G1ReservePercent=20
+    -XX:G1HeapWastePercent=5
+    -XX:G1MixedGCCountTarget=4
+    -XX:InitiatingHeapOccupancyPercent=15
     -XX:G1MixedGCLiveThresholdPercent=90
     -XX:G1RSetUpdatingPauseTimePercent=5
     -XX:SurvivorRatio=32
@@ -71,21 +72,16 @@ PAPER_JVM_FLAGS=(
     -XX:MaxTenuringThreshold=1
     -XX:+OptimizeStringConcat
     -XX:+UseCompressedOops
-    -XX:MaxMetaspaceSize=256M
-    -XX:CompressedClassSpaceSize=128M
-    -XX:ReservedCodeCacheSize=128M
-    -XX:-UseCodeCacheFlushing
+    -XX:MaxMetaspaceSize=192M
+    -XX:CompressedClassSpaceSize=96M
+    -XX:ReservedCodeCacheSize=96M
     -Xss256k
     -Djline.terminal=jline.UnsupportedTerminal
-    -Dio.netty.allocator.maxCachedBufferCapacity=524288
+    -Dio.netty.allocator.maxCachedBufferCapacity=262144
     -Dio.netty.recycler.maxCapacityPerThread=0
     -Dio.netty.eventLoopThreads=${NETTY_THREADS}
-    -Dio.netty.allocator.numDirectArenas=${NETTY_THREADS}
-    -Dio.netty.allocator.numHeapArenas=${NETTY_THREADS}
     -Dcom.mojang.eula.agree=true
     -DIReallyKnowWhatIAmDoingISwear
-    -Dusing.aikars.flags=https://mcflags.emc.gs
-    -Daikars.new.flags=true
 )
 
 BUNGEE_JVM_FLAGS=(
@@ -93,25 +89,22 @@ BUNGEE_JVM_FLAGS=(
     -Xms128M
     -XX:+UseG1GC
     -XX:+ParallelRefProcEnabled
-    -XX:MaxGCPauseMillis=30
+    -XX:MaxGCPauseMillis=50
     -XX:+UnlockExperimentalVMOptions
     -XX:+DisableExplicitGC
     -XX:+PerfDisableSharedMem
     -XX:+OptimizeStringConcat
     -XX:+UseCompressedOops
-    -XX:MaxMetaspaceSize=128M
-    -XX:ReservedCodeCacheSize=64M
+    -XX:MaxMetaspaceSize=96M
     -Xss256k
-    -Dio.netty.allocator.maxCachedBufferCapacity=524288
+    -Dio.netty.allocator.maxCachedBufferCapacity=262144
     -Dio.netty.recycler.maxCapacityPerThread=0
     -Dio.netty.eventLoopThreads=${NETTY_THREADS}
-    -Dio.netty.allocator.numDirectArenas=${NETTY_THREADS}
-    -Dio.netty.allocator.numHeapArenas=${NETTY_THREADS}
     -Deaglerxbungee.stfu=true
 )
 
 # =============================================================
-# RCON — each command sent individually to avoid mangling
+# RCON
 # =============================================================
 RCON_PASS="chunkystart"
 
@@ -162,44 +155,29 @@ setup_op_account() {
 ]
 OPEOF
     echo "   ops.json written (level 4, UUID: ${V3_UUID})"
-
-    mc_command "op ${OP_USERNAME}"
-    echo "   RCON op command sent"
 }
 
 # =============================================================
-# IDLE MODE — safe version that does NOT kill entities
+# IDLE MODE - Reduced tick rate but keeps mob spawning logic
 # =============================================================
 enter_idle_mode() {
     [ "$IDLE_MODE" = true ] && return
     IDLE_MODE=true
-    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"
+    # Only reduce tick speed, don't disable spawning entirely
+    mc_command "gamerule randomTickSpeed 1"
+    # Clear excess hostile mobs to reduce lag when idle
+    mc_command "kill @e[type=Zombie,r=200]"
+    mc_command "kill @e[type=Skeleton,r=200]"
+    mc_command "kill @e[type=Spider,r=200]"
+    mc_command "kill @e[type=Creeper,r=200]"
+    echo "[IDLE] Low-power mode — reduced ticks, cleared distant mobs"
 }
 
 exit_idle_mode() {
     [ "$IDLE_MODE" = false ] && return
     IDLE_MODE=false
-    mc_command "gamerule randomTickSpeed 3"
-    mc_command "gamerule doMobSpawning true"
-    echo "[IDLE] Gameplay restored"
+    mc_command "gamerule randomTickSpeed 2"
+    echo "[IDLE] Normal gameplay restored"
 }
 
 # =============================================================
@@ -303,6 +281,7 @@ echo "eula=true" > eula.txt
 
 echo "[2/7] Writing core server configs + starting WindSpigot..."
 
+# FIX: Enable mobs, use DEFAULT world type for survival
 cat > server.properties << 'EOF'
 server-port=25565
 server-ip=127.0.0.1
@@ -311,29 +290,30 @@ spawn-protection=0
 max-players=20
 view-distance=6
 gamemode=0
-difficulty=1
+difficulty=2
 level-name=world
-level-type=FLAT
-level-seed=8678942899319966093
+level-type=DEFAULT
+level-seed=
 generate-structures=true
-motd=Vanilla Survival Eaglercraft
+motd=Survival Eaglercraft
 pvp=true
 allow-flight=false
 white-list=false
 spawn-npcs=true
-spawn-animals=false
-spawn-monsters=false
+spawn-animals=true
+spawn-monsters=true
 enable-command-block=false
 allow-nether=true
 use-native-transport=true
-network-compression-threshold=-1
-entity-broadcast-range-percentage=50
-max-tick-time=-1
+network-compression-threshold=256
+entity-broadcast-range-percentage=75
+max-tick-time=60000
 enable-rcon=true
 rcon.port=25575
 rcon.password=chunkystart
 EOF
 
+# FIX: Balanced mob spawning - not too many, not too few
 cat > bukkit.yml << 'EOF'
 settings:
   allow-end: true
@@ -342,18 +322,19 @@ settings:
   shutdown-message: Server closed
   save-user-cache-on-stop-only: true
 spawn-limits:
-  monsters: 30
-  animals: 6
-  water-animals: 2
-  ambient: 1
+  monsters: 50
+  animals: 10
+  water-animals: 5
+  ambient: 3
 chunk-gc:
-  period-in-ticks: 600
+  period-in-ticks: 400
 ticks-per:
-  animal-spawns: 600
-  monster-spawns: 4
-  autosave: 12000
+  animal-spawns: 400
+  monster-spawns: 2
+  autosave: 6000
 EOF
 
+# FIX: Better entity activation ranges for survival gameplay
 cat > spigot.yml << 'EOF'
 config-version: 8
 settings:
@@ -372,32 +353,34 @@ commands:
 world-settings:
   default:
     verbose: false
-    view-distance: 4
-    mob-spawn-range: 3
+    view-distance: 6
+    mob-spawn-range: 6
     entity-activation-range:
-      animals: 12
-      monsters: 20
-      misc: 6
-      tick-inactive-villagers: false
-    entity-tracking-range:
-      players: 48
-      animals: 32
+      animals: 24
       monsters: 32
-      misc: 16
-      other: 48
+      raiders: 48
+      misc: 8
+      tick-inactive-villagers: true
+    entity-tracking-range:
+      players: 64
+      animals: 48
+      monsters: 48
+      misc: 32
+      other: 64
     ticks-per:
       hopper-transfer: 8
       hopper-check: 1
     hopper-amount: 1
-    max-entity-collisions: 2
+    max-entity-collisions: 4
     merge-radius:
-      exp: 6.0
-      item: 4.0
-    arrow-despawn-rate: 60
-    item-despawn-rate: 3000
-    nerf-spawner-mobs: true
-    zombie-aggressive-towards-villager: false
-    enable-zombie-pigmen-portal-spawns: false
+      exp: 4.0
+      item: 3.5
+    arrow-despawn-rate: 300
+    item-despawn-rate: 6000
+    nerf-spawner-mobs: false
+    zombie-aggressive-towards-villager: true
+    enable-zombie-pigmen-portal-spawns: true
+    max-tnt-per-tick: 20
 EOF
 
 cat > windspigot.yml << 'EOF'
@@ -418,8 +401,7 @@ settings:
   reduced-chunk-loads: true
   lag-compensated-potions: false
   anti-xray:
-    enabled: true
-    engine-mode: 2
+    enabled: false
   hit-detection:
     enabled: true
     threshold: 1.0
@@ -432,8 +414,8 @@ settings:
       extra-horizontal: 0.425
       extra-vertical: 0.085
   chunk:
-    threads: 1
-    players-per-thread: 25
+    threads: 2
+    players-per-thread: 10
 EOF
 
 cat > nacho.yml << 'EOF'
@@ -441,7 +423,7 @@ settings:
   stop-notify-bungee: true
   anti-malware: true
   use-tcp-nodelay: true
-  brand-name: "PVP"
+  brand-name: "Survival"
 EOF
 
 setup_op_account
@@ -483,25 +465,35 @@ echo " ======================"
 echo ""
 
 # =============================================================
-# STEP 3: PVP gamerules — each command sent separately
+# STEP 3: Survival gamerules
 # =============================================================
-echo "[3/7] Setting PVP gamerules..."
+echo "[3/7] Setting Survival 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 "gamerule mobGriefing true"
+mc_command "gamerule doMobSpawning true"
+mc_command "gamerule doDaylightCycle true"
+mc_command "gamerule doWeatherCycle true"
+mc_command "gamerule randomTickSpeed 2"
+mc_command "gamerule spawnRadius 10"
+mc_command "gamerule maxEntityCramming 12"
 mc_command "difficulty 2"
 mc_command "defaultgamemode survival"
-echo " PVP gamerules set"
+echo " Survival gamerules set"
 echo ""
 
 # =============================================================
-# STEP 4: Idle mode — safe version
+# STEP 4: Initial idle mode if no players
 # =============================================================
-echo "[4/7] Applying idle mode (no players)..."
-enter_idle_mode
+echo "[4/7] Checking for players..."
+PLAYER_COUNT=$(get_player_count)
+if [ "$PLAYER_COUNT" = "0" ]; then
+    enter_idle_mode
+else
+    echo " Players online: $PLAYER_COUNT"
+fi
 echo ""
 
 # =============================================================
@@ -509,16 +501,13 @@ echo ""
 # =============================================================
 echo "[5/7] Writing BungeeCord config..."
 
-# ===============================
-# BUNGEE CONFIG
-# ===============================
 cd "$BUNGEE_DIR"
 
 cat > config.yml << 'EOF'
 server_connect_timeout: 5000
 remote_ping_cache: -1
 forge_support: false
-player_limit: 10
+player_limit: 20
 permissions:
   default:
     - bungeecord.command.server
@@ -532,12 +521,12 @@ disabled_commands:
   - disabledcommandhere
 servers:
   lobby:
-    motd: '&aEaglercraft PVP'
+    motd: '&aEaglercraft Survival'
     address: 127.0.0.1:25565
     restricted: false
 listeners:
   - query_port: 25577
-    motd: '&6Eaglercraft 1.8.8 PVP'
+    motd: '&6Eaglercraft 1.8.8 Survival'
     tab_list: GLOBAL_PING
     query_enabled: false
     proxy_protocol: false
@@ -547,7 +536,7 @@ listeners:
       - lobby
     bind_local_address: true
     host: 127.0.0.1:25577
-    max_players: 10
+    max_players: 20
     tab_size: 60
     force_default_server: true
 ip_forward: true
@@ -562,12 +551,6 @@ 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 ""
 
 # =============================================================
@@ -612,16 +595,12 @@ echo " Starting BungeeCord..."
 
 patch_eagler_port
 
-# === NEW: MOTD AND ICON PATCH ===
+# MOTD Patch
 LISTENERS_NOW=$(find_listeners_yml)
 if [ -n "$LISTENERS_NOW" ]; then
-    # Title: &e&l★ &a&lSURVIVAL &e&l★
-    # Subtitle: &r&7Survive, craft, explore, and thrive!
-    sed -i 's/An EaglercraftX server/\&e\&l★ \&a\&lSurvival Server \&e\&l★/g' "$LISTENERS_NOW"
-    sed -i 's/smodusermc-server.hf.space/\&r\&7Survive, craft and explore!/g' "$LISTENERS_NOW"
+    sed -i 's/An EaglercraftX server/\&a\&lSurvival Server/g' "$LISTENERS_NOW"
 fi
 
-
 EAGLER_DIR=$(dirname "$(find_listeners_yml)" 2>/dev/null)
 
 if [ -n "$EAGLER_DIR" ]; then
@@ -651,9 +630,8 @@ done
 if [ "$PORT_READY" = true ]; then
     echo ""
     echo "============================================"
-    echo " PVP SERVER READY — EaglerCraft on :7860"
+    echo " SURVIVAL SERVER READY — EaglerCraft :7860"
     [ -n "$OP_USERNAME" ] && echo " OP: $OP_USERNAME (level 4)"
-    echo " Plugins Synced via HuggingFace!"
     echo "============================================"
 else
     echo " Port 7860 NOT open!"
@@ -690,21 +668,18 @@ hf_sync_loop &
 SYNC_PID=$!
 
 # =============================================================
-# Shutdown — save world properly, then push, then stop processes
+# Shutdown
 # =============================================================
 graceful_shutdown() {
     echo " Shutting down..."
-    mc_command "gamerule doMobSpawning true"
     mc_command "gamerule randomTickSpeed 3"
     mc_command "save-all"
     sleep 5
     hf_push_saves
     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
 }
@@ -729,7 +704,6 @@ while true; do
         IDLE_MODE=false
         start_windspigot
         sleep 45
-        # 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
@@ -737,10 +711,9 @@ while true; do
         if [ -n "$OP_USERNAME" ]; then
             mc_command "op ${OP_USERNAME}"
         fi
-        mc_command "gamerule pvp true"
-        mc_command "gamerule keepInventory false"
-        mc_command "gamerule mobGriefing false"
-        enter_idle_mode
+        mc_command "difficulty 2"
+        mc_command "gamerule doMobSpawning true"
+        mc_command "gamerule randomTickSpeed 2"
     fi
 
     if ! kill -0 $BUNGEE_PID 2>/dev/null; then
@@ -763,6 +736,7 @@ while true; do
         fi
     fi
 
+    # Log monitoring
     if [ $((LOOP_COUNT % 5)) -eq 0 ]; then
         CURRENT_LINE=$(wc -l < /tmp/paper.log 2>/dev/null || echo 0)
         if [ "$CURRENT_LINE" -gt "$LAST_LOG_LINE" ]; then
@@ -773,6 +747,7 @@ while true; do
         fi
     fi
 
+    # Log trimming
     if [ $((LOOP_COUNT % 30)) -eq 0 ]; then
         for LF in /tmp/paper.log /tmp/bungee.log; do
             LS=$(stat -c%s "$LF" 2>/dev/null || echo 0)
@@ -784,6 +759,7 @@ while true; do
         LAST_LOG_LINE=$(wc -l < /tmp/paper.log 2>/dev/null || echo 0)
     fi
 
+    # Status output
     if [ $((LOOP_COUNT % 5)) -eq 0 ]; then
         RSS=$(ps -p $BACKEND_PID -o rss= 2>/dev/null | awk '{printf "%.0f", $1/1024}')
         echo "[STATUS] Players: ${PLAYER_COUNT:-?} | RAM: ${RSS:-?}MB | $([ "$IDLE_MODE" = true ] && echo IDLE || echo ACTIVE)"