Merge remote-tracking branch 'origin/v7' into v7

mindustry-antigrief · Aug 20, 2023 · a1062e9 · a1062e9
2 parents 25e8b0c + fb1015f
commit a1062e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/mindustry/client/utils/AutoTransfer.kt b/core/src/mindustry/client/utils/AutoTransfer.kt
@@ -156,7 +156,7 @@ class AutoTransfer {
 
         Time.run(delay/2F) {
             if (item != null && core != null && player.within(core, itemTransferRange) && ratelimitRemaining > 1) {
-                if (held > 0 && item != player.unit().stack.item) Call.transferInventory(player, core)
+                if (held > 0 && item != player.unit().stack.item && (!net.server() || player.unit().stack.amount > 0)) Call.transferInventory(player, core)
                 else if (held == 0 || item != player.unit().stack.item || counts[maxID] > held) Call.requestItem(player, core, item, Int.MAX_VALUE)
                 else ratelimitRemaining++ // Yes im this lazy
                 item = null

diff --git a/core/src/mindustry/client/utils/ProcessorPatcher.kt b/core/src/mindustry/client/utils/ProcessorPatcher.kt
@@ -80,7 +80,7 @@ object ProcessorPatcher {
         if(player == null) return false
         if(!Server.current.whisper.canRun()) return false
         if(!whisperRatelimit.allow(player.id,
-            5000, 1, //Max 1 message per player per 5 seconds
+            15000, 1, //Max 1 message per player per 15 seconds
             5000, 5 //Max 5 messages per 5 seconds over all players
         )) return false
         Server.current.whisper(player, whisperText)