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

Clean up the code

Browse Source
This commit is contained in:
libraryaddict 2013-12-08 03:33:56 +13:00
parent a8b5c44a72
commit 90e3960923
4 changed files with 18 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/me/libraryaddict/disguise/disguisetypes/Disguise.java
View File

@ -23,7 +23,6 @@ import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.Packets;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.reflect.StructureModifier; import com.comphenix.protocol.reflect.StructureModifier;

1
src/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java
View File

@ -13,7 +13,6 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.EntityEquipment;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.Packets;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.reflect.StructureModifier; import com.comphenix.protocol.reflect.StructureModifier;

1
src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@ -24,7 +24,6 @@ import org.bukkit.potion.PotionEffect;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.Packets;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager; import com.comphenix.protocol.ProtocolManager;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;

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

@ -36,7 +36,6 @@ import org.bukkit.util.Vector;
import com.comphenix.protocol.PacketType; import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager; import com.comphenix.protocol.ProtocolManager;
import com.comphenix.protocol.events.ConnectionSide;
import com.comphenix.protocol.events.ListenerPriority; import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketContainer;
@ -740,8 +739,7 @@ public class PacketsManager {
watch.setValue(a); watch.setValue(a);
} }
} }
} } else if (event.getPacketType() == PacketType.Play.Server.NAMED_ENTITY_SPAWN) {
if (event.getPacketType() == PacketType.Play.Server.NAMED_ENTITY_SPAWN) {
PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA); PacketContainer packet = new PacketContainer(PacketType.Play.Server.ENTITY_METADATA);
StructureModifier<Object> mods = packet.getModifier(); StructureModifier<Object> mods = packet.getModifier();
mods.write(0, observer.getEntityId()); mods.write(0, observer.getEntityId());
@ -752,8 +750,7 @@ public class PacketsManager {
watchableList.add(new WrappedWatchableObject(0, b)); watchableList.add(new WrappedWatchableObject(0, b));
packet.getWatchableCollectionModifier().write(0, watchableList); packet.getWatchableCollectionModifier().write(0, watchableList);
event.setPacket(packet); event.setPacket(packet);
} } else if (event.getPacketType() == PacketType.Play.Server.ATTACH_ENTITY
if (event.getPacketType() == PacketType.Play.Server.ATTACH_ENTITY
|| event.getPacketType() == PacketType.Play.Server.REL_ENTITY_MOVE || event.getPacketType() == PacketType.Play.Server.REL_ENTITY_MOVE
|| event.getPacketType() == PacketType.Play.Server.ENTITY_MOVE_LOOK || event.getPacketType() == PacketType.Play.Server.ENTITY_MOVE_LOOK
|| event.getPacketType() == PacketType.Play.Server.ENTITY_LOOK || event.getPacketType() == PacketType.Play.Server.ENTITY_LOOK
@ -824,8 +821,7 @@ public class PacketsManager {
} }
} }
} }
} } else if (event.getPacketType() == PacketType.Play.Server.WINDOW_ITEMS) {
if (event.getPacketType() == PacketType.Play.Server.WINDOW_ITEMS) {
event.setPacket(event.getPacket().deepClone()); event.setPacket(event.getPacket().deepClone());
StructureModifier<ItemStack[]> mods = event.getPacket().getItemArrayModifier(); StructureModifier<ItemStack[]> mods = event.getPacket().getItemArrayModifier();
ItemStack[] items = mods.read(0); ItemStack[] items = mods.read(0);
@ -949,9 +945,7 @@ public class PacketsManager {
} }
} }
} }
} } else if (event.getPacketType() == PacketType.Play.Client.WINDOW_CLICK) {
else if (event.getPacketType() == PacketType.Play.Client.WINDOW_CLICK) {
int slot = event.getPacket().getIntegers().read(1); int slot = event.getPacket().getIntegers().read(1);
org.bukkit.inventory.ItemStack clickedItem; org.bukkit.inventory.ItemStack clickedItem;
if (event.getPacket().getIntegers().read(3) == 1) { if (event.getPacket().getIntegers().read(3) == 1) {
@ -1105,18 +1099,12 @@ public class PacketsManager {
if (disguise != null) { if (disguise != null) {
// If packet is PacketType.Play.Server.UPDATE_ATTRIBUTES // If packet is PacketType.Play.Server.UPDATE_ATTRIBUTES
// This packet sends attributes // This packet sends attributes
if (sentPacket.getType() == PacketType.Play.Server.UPDATE_ATTRIBUTES) {
if (sentPacket.getType() == PacketType.Play.Server.UPDATE_ATTRIBUTES)
{
packets = new PacketContainer[0]; packets = new PacketContainer[0];
} }
// Else if the packet is sending entity metadata // Else if the packet is sending entity metadata
if (sentPacket.getType() == PacketType.Play.Server.ENTITY_METADATA) else if (sentPacket.getType() == PacketType.Play.Server.ENTITY_METADATA) {
{
List<WrappedWatchableObject> watchableObjects = disguise.getWatcher().convert( List<WrappedWatchableObject> watchableObjects = disguise.getWatcher().convert(
packets[0].getWatchableCollectionModifier().read(0)); packets[0].getWatchableCollectionModifier().read(0));
packets[0] = new PacketContainer(sentPacket.getType()); packets[0] = new PacketContainer(sentPacket.getType());
@ -1126,37 +1114,31 @@ public class PacketsManager {
} }
// Else if the packet is spawning.. // Else if the packet is spawning..
if (sentPacket.getType() == PacketType.Play.Server.NAMED_ENTITY_SPAWN else if (sentPacket.getType() == PacketType.Play.Server.NAMED_ENTITY_SPAWN
|| sentPacket.getType() == PacketType.Play.Server.SPAWN_ENTITY_LIVING || sentPacket.getType() == PacketType.Play.Server.SPAWN_ENTITY_LIVING
|| sentPacket.getType() == PacketType.Play.Server.SPAWN_ENTITY_EXPERIENCE_ORB || sentPacket.getType() == PacketType.Play.Server.SPAWN_ENTITY_EXPERIENCE_ORB
|| sentPacket.getType() == PacketType.Play.Server.SPAWN_ENTITY || sentPacket.getType() == PacketType.Play.Server.SPAWN_ENTITY
|| sentPacket.getType() == PacketType.Play.Server.SPAWN_ENTITY_PAINTING) || sentPacket.getType() == PacketType.Play.Server.SPAWN_ENTITY_PAINTING) {
packets = constructSpawnPackets(disguise, entity); packets = constructSpawnPackets(disguise, entity);
}
// Else if the disguise is attempting to send players a forbidden packet // Else if the disguise is attempting to send players a forbidden packet
if (sentPacket.getType() == PacketType.Play.Server.ANIMATION) else if (sentPacket.getType() == PacketType.Play.Server.ANIMATION) {
{
if (disguise.getType().isMisc() || (packets[0].getIntegers().read(1) == 3 && !disguise.getType().isPlayer())) { if (disguise.getType().isMisc() || (packets[0].getIntegers().read(1) == 3 && !disguise.getType().isPlayer())) {
packets = new PacketContainer[0]; packets = new PacketContainer[0];
} }
} }
if (sentPacket.getType() == PacketType.Play.Server.COLLECT) else if (sentPacket.getType() == PacketType.Play.Server.COLLECT) {
{
if (disguise.getType().isMisc()) { if (disguise.getType().isMisc()) {
packets = new PacketContainer[0]; packets = new PacketContainer[0];
} }
} }
// Else if the disguise is moving.
if (sentPacket.getType() == PacketType.Play.Server.ENTITY_MOVE_LOOK
|| sentPacket.getType() == PacketType.Play.Server.ENTITY_LOOK
|| sentPacket.getType() == PacketType.Play.Server.ENTITY_TELEPORT)
{ // Else if the disguise is moving.
else if (sentPacket.getType() == PacketType.Play.Server.ENTITY_MOVE_LOOK
|| sentPacket.getType() == PacketType.Play.Server.ENTITY_LOOK
|| sentPacket.getType() == PacketType.Play.Server.ENTITY_TELEPORT) {
if (sentPacket.getType() == PacketType.Play.Server.ENTITY_LOOK if (sentPacket.getType() == PacketType.Play.Server.ENTITY_LOOK
&& disguise.getType() == DisguiseType.WITHER_SKULL) { && disguise.getType() == DisguiseType.WITHER_SKULL) {
packets = new PacketContainer[0]; packets = new PacketContainer[0];
@ -1177,9 +1159,7 @@ public class PacketsManager {
} }
} }
if (sentPacket.getType() == PacketType.Play.Server.ENTITY_EQUIPMENT) else if (sentPacket.getType() == PacketType.Play.Server.ENTITY_EQUIPMENT) {
{
int slot = (Integer) packets[0].getModifier().read(1) - 1; int slot = (Integer) packets[0].getModifier().read(1) - 1;
if (slot < 0) if (slot < 0)
slot = 4; slot = 4;
@ -1191,17 +1171,13 @@ public class PacketsManager {
} }
} }
if (sentPacket.getType() == PacketType.Play.Server.BED) else if (sentPacket.getType() == PacketType.Play.Server.BED) {
{
if (!disguise.getType().isPlayer()) { if (!disguise.getType().isPlayer()) {
packets = new PacketContainer[0]; packets = new PacketContainer[0];
} }
} }
if (sentPacket.getType() == PacketType.Play.Server.ENTITY_STATUS) else if (sentPacket.getType() == PacketType.Play.Server.ENTITY_STATUS) {
{
if (packets[0].getBytes().read(0) == (byte) 3) { if (packets[0].getBytes().read(0) == (byte) 3) {
packets = new PacketContainer[0]; packets = new PacketContainer[0];
} }