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

Template now templteID to make room for the actual template.

Browse Source
This commit is contained in:
MagicBot
2023-10-20 15:20:30 -04:00
parent 6559f232a3
commit 4795a315ad
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Zone.java
+4 -4
View File
@@ -39,7 +39,7 @@ public class Zone extends AbstractWorldObject {
public final float xOffset;
public final float zOffset;
public final float yOffset;
public final int template;
public final int templateID;
public final byte peace_zone;
public final String icon1;
public final String icon2;
@@ -86,7 +86,7 @@ public class Zone extends AbstractWorldObject {
this.xOffset = rs.getFloat("xOffset");
this.zOffset = rs.getFloat("zOffset");
this.yOffset = rs.getFloat("yOffset");
this.template = rs.getInt("template");
this.templateID = rs.getInt("template");
this.peace_zone = rs.getByte("peace_zone");
this.icon1 = rs.getString("icon1");
this.icon2 = rs.getString("icon2");
@@ -123,7 +123,7 @@ public class Zone extends AbstractWorldObject {
public static void serializeForClientMsg(Zone zone, ByteBufferWriter writer) {
if (zone.template == 0 && zone.playerCityUUID == 0)
if (zone.templateID == 0 && zone.playerCityUUID == 0)
Logger.warn("Warning! WorldServerMap with ID " + zone.getObjectUUID() + " has a loadnum of 0 (player city) and no city linked. This will probably crash the client!");
// Player City Terraform values serialized here.
@@ -141,7 +141,7 @@ public class Zone extends AbstractWorldObject {
writer.putInt(0);
writer.putInt(0);
writer.putInt(zone.template);
writer.putInt(zone.templateID);
if (zone.playerCityUUID > 0) {
City k = City.getCity(zone.playerCityUUID);