Browse Source

Class renamed to fix case.

master
MagicBot 2 years ago
parent
commit
994db1e131
  1. 2
      src/engine/net/client/Protocol.java
  2. 2
      src/engine/net/client/handlers/CityDataHandler.java
  3. 2
      src/engine/net/client/handlers/RequestEnterWorldHandler.java
  4. 10
      src/engine/net/client/msg/CityDataMsg.java

2
src/engine/net/client/Protocol.java

@ -74,7 +74,7 @@ public enum Protocol { @@ -74,7 +74,7 @@ public enum Protocol {
CHECKUNIQUEGUILD(0x689097D7, GuildCreationOptionsMsg.class, GuildCreationOptionsHandler.class), // Set Guild Name/Motto in Use Guild Charter
CITYASSET(0x7cae1678, CityAssetMsg.class, null),
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.
CLAIMASSET(0x948C62CC, ClaimAssetMsg.class, ClaimAssetMsgHandler.class), // ClaimAsset
CLAIMGUILDTREE(0xFD1C6442, ClaimGuildTreeMsg.class, ClaimGuildTreeMsgHandler.class),

2
src/engine/net/client/handlers/CityDataHandler.java

@ -54,7 +54,7 @@ public class CityDataHandler extends AbstractClientMsgHandler { @@ -54,7 +54,7 @@ public class CityDataHandler extends AbstractClientMsgHandler {
updateCities = true;
}
cityDataMsg cityDataMsg = new cityDataMsg(SessionManager.getSession(playerCharacter), false);
CityDataMsg cityDataMsg = new CityDataMsg(SessionManager.getSession(playerCharacter), false);
cityDataMsg.updateMines(true);
cityDataMsg.updateCities(updateCities);

2
src/engine/net/client/handlers/RequestEnterWorldHandler.java

@ -99,7 +99,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler { @@ -99,7 +99,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
}
// Object Data
cityDataMsg wom = new cityDataMsg(session, true);
CityDataMsg wom = new CityDataMsg(session, true);
dispatch = Dispatch.borrow(player, wom);
DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);

10
src/engine/net/client/msg/cityDataMsg.java → src/engine/net/client/msg/CityDataMsg.java

@ -27,7 +27,7 @@ import java.nio.ByteBuffer; @@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
public class cityDataMsg extends ClientNetMsg {
public class CityDataMsg extends ClientNetMsg {
private Session s;
private final boolean forEnterWorld;
@ -47,13 +47,13 @@ public class cityDataMsg extends ClientNetMsg { @@ -47,13 +47,13 @@ public class cityDataMsg extends ClientNetMsg {
* @param s Session
* @param forEnterWorld boolean flag
*/
public cityDataMsg(Session s, boolean forEnterWorld) {
public CityDataMsg(Session s, boolean forEnterWorld) {
super(Protocol.CITYDATA);
this.s = s;
this.forEnterWorld = forEnterWorld;
}
public cityDataMsg(boolean updateCities, boolean updateRunegates, boolean updateMines) {
public CityDataMsg(boolean updateCities, boolean updateRunegates, boolean updateMines) {
super(Protocol.CITYDATA);
this.s = null;
this.forEnterWorld = false;
@ -68,7 +68,7 @@ public class cityDataMsg extends ClientNetMsg { @@ -68,7 +68,7 @@ public class cityDataMsg extends ClientNetMsg {
* past the limit) then this constructor Throws that Exception to the
* caller.
*/
public cityDataMsg(AbstractConnection origin, ByteBufferReader reader) {
public CityDataMsg(AbstractConnection origin, ByteBufferReader reader) {
super(Protocol.CITYDATA, origin, reader);
this.forEnterWorld = false;
}
@ -174,7 +174,7 @@ public class cityDataMsg extends ClientNetMsg { @@ -174,7 +174,7 @@ public class cityDataMsg extends ClientNetMsg {
//Check to see if its time to renew cache.
if (cachedExpireTime < System.currentTimeMillis()) {
synchronized (cachedEnterWorld) {
cityDataMsg.attemptSerializeForEnterWorld(cachedEnterWorld);
CityDataMsg.attemptSerializeForEnterWorld(cachedEnterWorld);
}
cachedExpireTime = startT + 60000;
}
Loading…
Cancel
Save