diff --git a/core/src/Mindustry.gwt.xml b/core/src/Mindustry.gwt.xml index 1dcf056855..5fdf4b2778 100644 --- a/core/src/Mindustry.gwt.xml +++ b/core/src/Mindustry.gwt.xml @@ -14,4 +14,5 @@ + \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index 39078cd2aa..1c56ad2b8e 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -10,7 +10,6 @@ import io.anuke.mindustry.entities.BulletType; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.SyncEntity; import io.anuke.mindustry.entities.enemies.Enemy; -import io.anuke.mindustry.graphics.Fx; import io.anuke.mindustry.io.Platform; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net.SendMode; @@ -20,7 +19,6 @@ import io.anuke.mindustry.resource.Item; import io.anuke.mindustry.world.Map; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.ProductionBlocks; -import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Timers; import io.anuke.ucore.entities.BaseBulletType; import io.anuke.ucore.entities.Entities; @@ -275,7 +273,6 @@ public class NetClient extends Module { Tile next = tile.getNearby(packet.rotation); tile.entity.items[packet.itemid] --; next.block().handleItem(Item.getByID(packet.itemid), next, tile); - Effects.effect(Fx.transfer, tile.drawx(), tile.drawy(), packet.rotation * 90); }); } diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 29a6345ad2..cd7fa113a5 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -174,7 +174,7 @@ public class ServerControl extends Module { }else{ info("&lyNo players connected."); } - info("&lbFPS: {0}", Gdx.graphics.getFramesPerSecond()); + info("&lbFPS: {0}", (int)(60f/Timers.delta())); } });