SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix crashes

Browse Source
This commit is contained in:
Andrew 2013-07-30 15:31:07 +12:00
parent 6af89013c5
commit f3f451a9c6
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/me/libraryaddict/disguise/DisguiseAPI.java
View File

@ -327,7 +327,7 @@ public class DisguiseAPI {
StructureModifier<Entity> entityModifer = event.getPacket().getEntityModifier(event.getPlayer().getWorld()); StructureModifier<Entity> entityModifer = event.getPacket().getEntityModifier(event.getPlayer().getWorld());
org.bukkit.entity.Entity entity = entityModifer.read(0); org.bukkit.entity.Entity entity = entityModifer.read(0);
if (entity == event.getPlayer() && values.containsKey(entity.getEntityId())) { if (entity == event.getPlayer() && values.containsKey(entity.getEntityId())) {
PacketContainer[] packets = libsDisguises.fixUpPacket(event.getPacket(), event.getPlayer()); PacketContainer[] packets = libsDisguises.transformPacket(event.getPacket(), event.getPlayer());
try { try {
for (PacketContainer packet : packets) { for (PacketContainer packet : packets) {
if (packet.equals(event.getPacket())) if (packet.equals(event.getPacket()))
@ -363,6 +363,7 @@ public class DisguiseAPI {
case Packets.Server.ENTITY_TELEPORT: case Packets.Server.ENTITY_TELEPORT:
case Packets.Server.ENTITY_HEAD_ROTATION: case Packets.Server.ENTITY_HEAD_ROTATION:
case Packets.Server.MOB_EFFECT: case Packets.Server.MOB_EFFECT:
case Packets.Server.ENTITY_EQUIPMENT:
if (event.getPacketID() == Packets.Server.NAMED_ENTITY_SPAWN) { if (event.getPacketID() == Packets.Server.NAMED_ENTITY_SPAWN) {
PacketContainer packet = new PacketContainer(Packets.Server.ENTITY_METADATA); PacketContainer packet = new PacketContainer(Packets.Server.ENTITY_METADATA);
StructureModifier<Object> mods = packet.getModifier(); StructureModifier<Object> mods = packet.getModifier();
@ -472,7 +473,7 @@ public class DisguiseAPI {
Packet20NamedEntitySpawn packet = new Packet20NamedEntitySpawn((EntityHuman) entityplayer); Packet20NamedEntitySpawn packet = new Packet20NamedEntitySpawn((EntityHuman) entityplayer);
entityplayer.playerConnection.sendPacket(packet); entityplayer.playerConnection.sendPacket(packet);
if (!tracker.tracker.getDataWatcher().d()) { if (!tracker.tracker.getDataWatcher().d()) {
entityplayer.playerConnection.sendPacket(new Packet40EntityMetadata(id, tracker.tracker.getDataWatcher(), true)); entityplayer.playerConnection.sendPacket(new Packet40EntityMetadata(player.getEntityId(), tracker.tracker.getDataWatcher(), true));
} }
if (tracker.tracker instanceof EntityLiving) { if (tracker.tracker instanceof EntityLiving) {
@ -496,14 +497,14 @@ public class DisguiseAPI {
ex.printStackTrace(); ex.printStackTrace();
} }
if (isMoving) { if (isMoving) {
entityplayer.playerConnection.sendPacket(new Packet28EntityVelocity(id, tracker.tracker.motX, tracker.tracker.motY, entityplayer.playerConnection.sendPacket(new Packet28EntityVelocity(player.getEntityId(), tracker.tracker.motX, tracker.tracker.motY,
tracker.tracker.motZ)); tracker.tracker.motZ));
} }
// CraftBukkit start // CraftBukkit start
if (tracker.tracker.vehicle != null && id > tracker.tracker.vehicle.id) { if (tracker.tracker.vehicle != null && player.getEntityId() > tracker.tracker.vehicle.id) {
entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, tracker.tracker, tracker.tracker.vehicle)); entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, tracker.tracker, tracker.tracker.vehicle));
} else if (tracker.tracker.passenger != null && id > tracker.tracker.passenger.id) { } else if (tracker.tracker.passenger != null && player.getEntityId() > tracker.tracker.passenger.id) {
entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, tracker.tracker.passenger, tracker.tracker)); entityplayer.playerConnection.sendPacket(new Packet39AttachEntity(0, tracker.tracker.passenger, tracker.tracker));
} }
@ -518,7 +519,7 @@ public class DisguiseAPI {
ItemStack itemstack = ((EntityLiving) tracker.tracker).getEquipment(i); ItemStack itemstack = ((EntityLiving) tracker.tracker).getEquipment(i);
if (itemstack != null) { if (itemstack != null) {
entityplayer.playerConnection.sendPacket(new Packet5EntityEquipment(id, i, itemstack)); entityplayer.playerConnection.sendPacket(new Packet5EntityEquipment(player.getEntityId(), i, itemstack));
} }
} }
} }
@ -536,7 +537,7 @@ public class DisguiseAPI {
// CraftBukkit start - Fix for nonsensical head yaw // CraftBukkit start - Fix for nonsensical head yaw
tracker.i = (int) Math.floor(tracker.tracker.getHeadRotation() * 256.0F / 360.0F); // tracker.ao() should be tracker.i = (int) Math.floor(tracker.tracker.getHeadRotation() * 256.0F / 360.0F); // tracker.ao() should be
// getHeadRotation // getHeadRotation
tracker.broadcast(new Packet35EntityHeadRotation(id, (byte) tracker.i)); tracker.broadcast(new Packet35EntityHeadRotation(player.getEntityId(), (byte) tracker.i));
// CraftBukkit end // CraftBukkit end
if (tracker.tracker instanceof EntityLiving) { if (tracker.tracker instanceof EntityLiving) {
@ -546,7 +547,7 @@ public class DisguiseAPI {
while (iterator.hasNext()) { while (iterator.hasNext()) {
MobEffect mobeffect = (MobEffect) iterator.next(); MobEffect mobeffect = (MobEffect) iterator.next();
entityplayer.playerConnection.sendPacket(new Packet41MobEffect(id, mobeffect)); entityplayer.playerConnection.sendPacket(new Packet41MobEffect(player.getEntityId(), mobeffect));
} }
} }
} }

4
src/me/libraryaddict/disguise/LibsDisguises.java
View File

@ -95,7 +95,7 @@ public class LibsDisguises extends JavaPlugin {
// Prevents problems and there is no advantage to be gained. // Prevents problems and there is no advantage to be gained.
if (entity == observer) if (entity == observer)
return; return;
PacketContainer[] packets = fixUpPacket(event.getPacket(), event.getPlayer()); PacketContainer[] packets = transformPacket(event.getPacket(), event.getPlayer());
if (packets.length == 0) if (packets.length == 0)
event.setCancelled(true); event.setCancelled(true);
else { else {
@ -301,7 +301,7 @@ public class LibsDisguises extends JavaPlugin {
} }
protected PacketContainer[] fixUpPacket(PacketContainer sentPacket, Player observer) { protected PacketContainer[] transformPacket(PacketContainer sentPacket, Player observer) {
PacketContainer[] packets = new PacketContainer[] { sentPacket }; PacketContainer[] packets = new PacketContainer[] { sentPacket };
try { try {
// First get the entity, the one sending this packet // First get the entity, the one sending this packet