Cleanup Dimension Registration packet, generate takes no arguments, and added fix to world to prevent providers from overwriting the dimension ID.

This commit is contained in:
LexManos committed 2013-05-23 22:06:13 -07:00
1 parent 68a31cecb2
commit e27de47090
3 files changed
+66 -63

No files matched your search

@@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.network.packet.DimensionRegisterPacket;
import com.google.common.base.Throwables;
import com.google.common.collect.MapMaker;
@@ -178,7 +179,7 @@ public abstract class ForgePacket
return UnsignedBytes.checkedCast(type.ordinal());
}
public abstract byte[] generatePacket(Object... data);
public abstract byte[] generatePacket();
public abstract ForgePacket consumePacket(byte[] data);
@@ -3,13 +3,14 @@
* License v1.0.
*/
package net.minecraftforge.common.network;
package net.minecraftforge.common.network.packet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.network.ForgePacket;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput;
@@ -36,7 +37,7 @@ public class DimensionRegisterPacket extends ForgePacket
}
@Override
public byte[] generatePacket(Object... data)
public byte[] generatePacket()
{
ByteArrayDataOutput dat = ByteStreams.newDataOutput();
dat.writeInt(this.dimensionId);
@@ -62,10 +63,6 @@ public class DimensionRegisterPacket extends ForgePacket
{
DimensionManager.registerDimension(dimensionId, providerId);
}
if (player != null && player.worldObj != null)
{
player.worldObj.provider.dimensionId = dimensionId;
}
}
}