Merge remote-tracking branch 'origin/master'

core/src/io/anuke/mindustry/entities/Player.java

@@ -809,6 +809,12 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
     //region read and write methods
 
+
+    @Override
+    public boolean isClipped(){
+        return false;
+    }
+
     @Override
     public void writeSave(DataOutput stream) throws IOException{
         stream.writeBoolean(isLocal);

core/src/io/anuke/mindustry/entities/traits/SyncTrait.java

@@ -1,7 +1,10 @@
 package io.anuke.mindustry.entities.traits;
 
+import io.anuke.mindustry.core.NetClient;
 import io.anuke.mindustry.net.Interpolator;
+import io.anuke.ucore.core.Core;
 import io.anuke.ucore.entities.trait.Entity;
+import io.anuke.ucore.util.Tmp;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -24,8 +27,20 @@ public interface SyncTrait extends Entity, TypeTrait{
 
     /**Interpolate entity position only. Override if you need to interpolate rotations or other values.*/
     default void interpolate(){
-        if(getInterpolator() == null)
+        if(getInterpolator() == null){
             throw new RuntimeException("This entity must have an interpolator to interpolate()!");
+        }
+
+        if(isClipped()){
+            //move off screen when no longer in bounds
+            if(!Tmp.r1.setSize(
+                    Core.camera.viewportWidth * Core.camera.zoom * NetClient.viewScale,
+                    Core.camera.viewportHeight * Core.camera.zoom * NetClient.viewScale)
+                    .setCenter(Core.camera.position.x, Core.camera.position.y).contains(getX(), getY())){
+                set(-99999f, -99999f);
+                return;
+            }
+        }
 
         getInterpolator().update();