From 7e788f212ab60d945bc03a710f24266fb41cd9f4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 15 Nov 2018 12:38:36 -0500 Subject: [PATCH] Additional fixes --- core/src/io/anuke/mindustry/core/NetClient.java | 2 +- core/src/io/anuke/mindustry/entities/traits/SyncTrait.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/core/NetClient.java b/core/src/io/anuke/mindustry/core/NetClient.java index 748b0fc869..a0b26e543f 100644 --- a/core/src/io/anuke/mindustry/core/NetClient.java +++ b/core/src/io/anuke/mindustry/core/NetClient.java @@ -45,7 +45,7 @@ import static io.anuke.mindustry.Vars.*; public class NetClient extends Module{ private final static float dataTimeout = 60 * 18; private final static float playerSyncTime = 2; - private final static float viewScale = 2f; + public final static float viewScale = 2f; private Timer timer = new Timer(5); /**Whether the client is currently connecting.*/ diff --git a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java b/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java index 4dd24deb88..c41fcbf264 100644 --- a/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/SyncTrait.java @@ -1,5 +1,6 @@ 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; @@ -32,7 +33,9 @@ public interface SyncTrait extends Entity, TypeTrait{ if(isClipped()){ //move off screen when no longer in bounds - if(!Tmp.r1.setSize(Core.camera.viewportWidth * Core.camera.zoom, Core.camera.viewportHeight * Core.camera.zoom) + 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;