BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Class renamed to fix case.

Browse Source
This commit is contained in:
MagicBot
2023-02-24 08:45:03 -05:00
parent 4422182eae
commit 994db1e131
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/Protocol.java
+1 -1
View File
@@ -74,7 +74,7 @@ public enum Protocol {
CHECKUNIQUEGUILD(0x689097D7, GuildCreationOptionsMsg.class, GuildCreationOptionsHandler.class), // Set Guild Name/Motto in Use Guild Charter CHECKUNIQUEGUILD(0x689097D7, GuildCreationOptionsMsg.class, GuildCreationOptionsHandler.class), // Set Guild Name/Motto in Use Guild Charter
CITYASSET(0x7cae1678, CityAssetMsg.class, null), CITYASSET(0x7cae1678, CityAssetMsg.class, null),
CITYCHOICE(0x406610BB, CityChoiceMsg.class, CityChoiceMsgHandler.class), CITYCHOICE(0x406610BB, CityChoiceMsg.class, CityChoiceMsgHandler.class),
CITYDATA(0xB8A947D4, cityDataMsg.class, CityDataHandler.class), CITYDATA(0xB8A947D4, CityDataMsg.class, CityDataHandler.class),
CITYZONE(0x254947F2, CityZoneMsg.class, null), //For Creating City Object Clientside(Terraform)/Rename City. CITYZONE(0x254947F2, CityZoneMsg.class, null), //For Creating City Object Clientside(Terraform)/Rename City.
CLAIMASSET(0x948C62CC, ClaimAssetMsg.class, ClaimAssetMsgHandler.class), // ClaimAsset CLAIMASSET(0x948C62CC, ClaimAssetMsg.class, ClaimAssetMsgHandler.class), // ClaimAsset
CLAIMGUILDTREE(0xFD1C6442, ClaimGuildTreeMsg.class, ClaimGuildTreeMsgHandler.class), CLAIMGUILDTREE(0xFD1C6442, ClaimGuildTreeMsg.class, ClaimGuildTreeMsgHandler.class),
src/engine/net/client/handlers/CityDataHandler.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class CityDataHandler extends AbstractClientMsgHandler {
updateCities = true; updateCities = true;
} }
cityDataMsg cityDataMsg = new cityDataMsg(SessionManager.getSession(playerCharacter), false); CityDataMsg cityDataMsg = new CityDataMsg(SessionManager.getSession(playerCharacter), false);
cityDataMsg.updateMines(true); cityDataMsg.updateMines(true);
cityDataMsg.updateCities(updateCities); cityDataMsg.updateCities(updateCities);
src/engine/net/client/handlers/RequestEnterWorldHandler.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
} }
// Object Data // Object Data
cityDataMsg wom = new cityDataMsg(session, true); CityDataMsg wom = new CityDataMsg(session, true);
dispatch = Dispatch.borrow(player, wom); dispatch = Dispatch.borrow(player, wom);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY); DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
src/engine/net/client/msg/cityDataMsg.java → src/engine/net/client/msg/CityDataMsg.java
+5 -5
View File
@@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
public class cityDataMsg extends ClientNetMsg { public class CityDataMsg extends ClientNetMsg {
private Session s; private Session s;
private final boolean forEnterWorld; private final boolean forEnterWorld;
@@ -47,13 +47,13 @@ public class cityDataMsg extends ClientNetMsg {
* @param s Session * @param s Session
* @param forEnterWorld boolean flag * @param forEnterWorld boolean flag
*/ */
public cityDataMsg(Session s, boolean forEnterWorld) { public CityDataMsg(Session s, boolean forEnterWorld) {
super(Protocol.CITYDATA); super(Protocol.CITYDATA);
this.s = s; this.s = s;
this.forEnterWorld = forEnterWorld; this.forEnterWorld = forEnterWorld;
} }
public cityDataMsg(boolean updateCities, boolean updateRunegates, boolean updateMines) { public CityDataMsg(boolean updateCities, boolean updateRunegates, boolean updateMines) {
super(Protocol.CITYDATA); super(Protocol.CITYDATA);
this.s = null; this.s = null;
this.forEnterWorld = false; this.forEnterWorld = false;
@@ -68,7 +68,7 @@ public class cityDataMsg extends ClientNetMsg {
* past the limit) then this constructor Throws that Exception to the * past the limit) then this constructor Throws that Exception to the
* caller. * caller.
*/ */
public cityDataMsg(AbstractConnection origin, ByteBufferReader reader) { public CityDataMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.CITYDATA, origin, reader); super(Protocol.CITYDATA, origin, reader);
this.forEnterWorld = false; this.forEnterWorld = false;
} }
@@ -174,7 +174,7 @@ public class cityDataMsg extends ClientNetMsg {
//Check to see if its time to renew cache. //Check to see if its time to renew cache.
if (cachedExpireTime < System.currentTimeMillis()) { if (cachedExpireTime < System.currentTimeMillis()) {
synchronized (cachedEnterWorld) { synchronized (cachedEnterWorld) {
cityDataMsg.attemptSerializeForEnterWorld(cachedEnterWorld); CityDataMsg.attemptSerializeForEnterWorld(cachedEnterWorld);
} }
cachedExpireTime = startT + 60000; cachedExpireTime = startT + 60000;
} }