keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Use correct tag types when reading Forced Chunk data. Fixes ticket loading. Closes #964

Browse source
This commit is contained in:
Lex Manos 2014-02-10 16:16:03 -08:00
parent c4972b7658
commit c8e0b4a193
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/minecraftforge/common/ForgeChunkManager.java
View file

@ -45,6 +45,7 @@ import net.minecraft.world.WorldServer;
import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigCategory;
import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property; import net.minecraftforge.common.config.Property;
import net.minecraftforge.common.util.Constants;
/** /**
* Manages chunkloading for mods. * Manages chunkloading for mods.
@ -369,7 +370,7 @@ public class ForgeChunkManager
try try
{ {
NBTTagCompound forcedChunkData = CompressedStreamTools.read(chunkLoaderData); NBTTagCompound forcedChunkData = CompressedStreamTools.read(chunkLoaderData);
return forcedChunkData.getTagList("TicketList", 9).tagCount() > 0; return forcedChunkData.getTagList("TicketList", Constants.NBT.TAG_COMPOUND).tagCount() > 0;
} }
catch (IOException e) catch (IOException e)
{ {
@ -409,7 +410,7 @@ public class ForgeChunkManager
FMLLog.log(Level.WARN, e, "Unable to read forced chunk data at %s - it will be ignored", chunkLoaderData.getAbsolutePath()); FMLLog.log(Level.WARN, e, "Unable to read forced chunk data at %s - it will be ignored", chunkLoaderData.getAbsolutePath());
return; return;
} }
NBTTagList ticketList = forcedChunkData.getTagList("TicketList", 9); NBTTagList ticketList = forcedChunkData.getTagList("TicketList", Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < ticketList.tagCount(); i++) for (int i = 0; i < ticketList.tagCount(); i++)
{ {
NBTTagCompound ticketHolder = (NBTTagCompound)ticketList.getCompoundTagAt(i); NBTTagCompound ticketHolder = (NBTTagCompound)ticketList.getCompoundTagAt(i);
@ -428,7 +429,7 @@ public class ForgeChunkManager
continue; continue;
} }
NBTTagList tickets = ticketHolder.getTagList("Tickets", 9); NBTTagList tickets = ticketHolder.getTagList("Tickets", Constants.NBT.TAG_COMPOUND);
for (int j = 0; j < tickets.tagCount(); j++) for (int j = 0; j < tickets.tagCount(); j++)
{ {
NBTTagCompound ticket = (NBTTagCompound) tickets.getCompoundTagAt(j); NBTTagCompound ticket = (NBTTagCompound) tickets.getCompoundTagAt(j);