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

Send teleport packet for all misc disguises (why not) and do the pitch for the disguise minecarts (facing direction)

Browse Source
This commit is contained in:
libraryaddict 2013-11-24 06:59:56 +13:00
parent 15a8974d1e
commit d6fba4c402
1 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/me/libraryaddict/disguise/utilities/PacketsManager.java
View File

@ -276,7 +276,6 @@ public class PacketsManager {
spawnPackets[0].getModifier().write(2, (int) Math.floor(loc.getY() * 32D)); spawnPackets[0].getModifier().write(2, (int) Math.floor(loc.getY() * 32D));
spawnPackets[0].getModifier().write(8, yaw); spawnPackets[0].getModifier().write(8, yaw);
if (disguise.getType() == DisguiseType.FALLING_BLOCK) {
// Make the teleport packet to make it visible.. // Make the teleport packet to make it visible..
spawnPackets[1] = new PacketContainer(Packets.Server.ENTITY_TELEPORT); spawnPackets[1] = new PacketContainer(Packets.Server.ENTITY_TELEPORT);
StructureModifier<Object> mods = spawnPackets[1].getModifier(); StructureModifier<Object> mods = spawnPackets[1].getModifier();
@ -286,7 +285,6 @@ public class PacketsManager {
mods.write(3, (int) Math.floor(loc.getZ() * 32D)); mods.write(3, (int) Math.floor(loc.getZ() * 32D));
mods.write(4, yaw); mods.write(4, yaw);
mods.write(5, (byte) (int) (loc.getPitch() * 256.0F / 360.0F)); mods.write(5, (byte) (int) (loc.getPitch() * 256.0F / 360.0F));
}
} }
if (spawnPackets[1] == null) { if (spawnPackets[1] == null) {
@ -317,11 +315,47 @@ public class PacketsManager {
} }
public static byte getPitch(DisguiseType disguiseType, DisguiseType entityType, byte value) {
switch (disguiseType) {
case MINECART:
case MINECART_CHEST:
case MINECART_FURNACE:
case MINECART_HOPPER:
case MINECART_MOB_SPAWNER:
case MINECART_TNT:
value = (byte) -value;
break;
default:
break;
}
switch (entityType) {
case MINECART:
case MINECART_CHEST:
case MINECART_FURNACE:
case MINECART_HOPPER:
case MINECART_MOB_SPAWNER:
case MINECART_TNT:
value = (byte) -value;
break;
default:
break;
}
return value;
}
/** /**
* Add the yaw for the disguises * Add the yaw for the disguises
*/ */
public static byte getYaw(DisguiseType disguiseType, DisguiseType entityType, byte value) { public static byte getYaw(DisguiseType disguiseType, DisguiseType entityType, byte value) {
switch (disguiseType) { switch (disguiseType) {
case MINECART:
case MINECART_CHEST:
case MINECART_FURNACE:
case MINECART_HOPPER:
case MINECART_MOB_SPAWNER:
case MINECART_TNT:
value += 64;
break;
case ENDER_DRAGON: case ENDER_DRAGON:
case WITHER_SKULL: case WITHER_SKULL:
value -= 128; value -= 128;
@ -340,6 +374,14 @@ public class PacketsManager {
break; break;
} }
switch (entityType) { switch (entityType) {
case MINECART:
case MINECART_CHEST:
case MINECART_FURNACE:
case MINECART_HOPPER:
case MINECART_MOB_SPAWNER:
case MINECART_TNT:
value -= 64;
break;
case ENDER_DRAGON: case ENDER_DRAGON:
case WITHER_SKULL: case WITHER_SKULL:
value += 128; value += 128;
@ -1138,8 +1180,10 @@ public class PacketsManager {
} else { } else {
packets[0] = sentPacket.shallowClone(); packets[0] = sentPacket.shallowClone();
StructureModifier<Object> mods = packets[0].getModifier(); StructureModifier<Object> mods = packets[0].getModifier();
byte value = (Byte) mods.read(4); byte yawValue = (Byte) mods.read(4);
mods.write(4, getYaw(disguise.getType(), DisguiseType.getType(entity.getType()), value)); mods.write(4, getYaw(disguise.getType(), DisguiseType.getType(entity.getType()), yawValue));
byte pitchValue = (Byte) mods.read(5);
mods.write(5, getPitch(disguise.getType(), DisguiseType.getType(entity.getType()), pitchValue));
if (sentPacket.getID() == Packets.Server.ENTITY_TELEPORT) { if (sentPacket.getID() == Packets.Server.ENTITY_TELEPORT) {
double y = getYModifier(entity, disguise.getType()); double y = getYModifier(entity, disguise.getType());
if (y != 0) { if (y != 0) {