MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

lastHotZoneUpdate instant moved to ZoneManager.

Browse Source
This commit is contained in:
MagicBot
2023-02-24 01:22:00 -05:00
parent 3260582e37
commit 8fde121570
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/CityDataHandler.java
+1 -5
View File
@@ -10,13 +10,9 @@ import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.*;
import engine.objects.City;
import engine.objects.Mine;
import engine.objects.PlayerCharacter;
import engine.server.world.WorldServer;
import engine.session.Session;
import java.time.ZoneId;
/*
* @Author:
* @Summary: Processes application protocol message which displays
@@ -68,7 +64,7 @@ public class CityDataHandler extends AbstractClientMsgHandler {
// If the hotZone has changed then update the client's map accordingly.
if (playerCharacter.getTimeStamp("hotzoneupdate") <= WorldServer.hotZoneLastUpdate.toEpochMilli() && ZoneManager.hotZone != null) {
if (playerCharacter.getTimeStamp("hotzoneupdate") <= ZoneManager.hotZoneLastUpdate.toEpochMilli() && ZoneManager.hotZone != null) {
HotzoneChangeMsg hotzoneChangeMsg = new HotzoneChangeMsg(Enum.GameObjectType.Zone.ordinal(), ZoneManager.hotZone.getObjectUUID());
dispatch = Dispatch.borrow(playerCharacter, hotzoneChangeMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
src/engine/net/client/msg/HotzoneChangeMsg.java
+2 -4
View File
@@ -11,15 +11,13 @@ package engine.net.client.msg;
import engine.gameManager.ConfigManager;
import engine.math.FastMath;
import engine.gameManager.ZoneManager;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.server.world.WorldServer;
import java.time.Duration;
import java.time.LocalDateTime;
public class HotzoneChangeMsg extends ClientNetMsg {
@@ -38,7 +36,7 @@ public class HotzoneChangeMsg extends ClientNetMsg {
int hotZoneDuration = Integer.parseInt(ConfigManager.MB_HOTZONE_DURATION.getValue());
endOfCycle = Duration.between(WorldServer.hotZoneLastUpdate, WorldServer.hotZoneLastUpdate.plusSeconds(hotZoneDuration * 3600));
endOfCycle = Duration.between(ZoneManager.hotZoneLastUpdate, ZoneManager.hotZoneLastUpdate.plusSeconds(hotZoneDuration * 3600));
}