diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java index 7349880f62..222e38cfd5 100644 --- a/core/src/mindustry/net/Administration.java +++ b/core/src/mindustry/net/Administration.java @@ -93,6 +93,13 @@ public class Administration{ if(rate.occurences > Config.interactRateKick.num()){ action.player.kick("You are interacting with too many blocks.", 1000 * 30); }else if(action.player.getInfo().messageTimer.get(60f * 2f)){ + + //I don't know what causes this so I'll make it log an error instead + new Exception("!!REPORT TO ANUKE: " + action.player.name + " was (likely) incorrectly ratelimited. " + + "action=" + action.type + + " player=" + action.player.name + "#" + action.player.id + + " tile=" + action.tile).printStackTrace(); + action.player.sendMessage("[scarlet]You are interacting with blocks too quickly."); } diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java index e1c95f9f35..cea0f911e7 100644 --- a/core/src/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java @@ -180,6 +180,12 @@ public class CoreBlock extends StorageBlock{ } } + @Override + public boolean canPickup(){ + //cores can never be picked up + return false; + } + @Override public void drawLight(){ Drawf.light(team, x, y, 30f * size, Pal.accent, 0.5f + Mathf.absin(20f, 0.1f));