mirror of
https://github.com/libraryaddict/LibsDisguises.git
synced 2024-08-26 23:29:35 +02:00
Clean up the flagwatcher converting code
This commit is contained in:
parent
2a0f2fe4aa
commit
f25117e461
|
@ -3,6 +3,7 @@ package me.libraryaddict.disguise.disguisetypes;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
@ -12,7 +13,6 @@ import org.bukkit.entity.LivingEntity;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.EntityEquipment;
|
import org.bukkit.inventory.EntityEquipment;
|
||||||
|
|
||||||
|
|
||||||
import com.comphenix.protocol.Packets;
|
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;
|
||||||
|
@ -65,26 +65,27 @@ public class FlagWatcher {
|
||||||
public List<WatchableObject> convert(List<WatchableObject> list) {
|
public List<WatchableObject> convert(List<WatchableObject> list) {
|
||||||
Iterator<WatchableObject> itel = list.iterator();
|
Iterator<WatchableObject> itel = list.iterator();
|
||||||
List<WatchableObject> newList = new ArrayList<WatchableObject>();
|
List<WatchableObject> newList = new ArrayList<WatchableObject>();
|
||||||
List<Integer> sentValues = new ArrayList<Integer>();
|
HashSet<Integer> sentValues = new HashSet<Integer>();
|
||||||
boolean sendAllCustom = false;
|
boolean sendAllCustom = false;
|
||||||
while (itel.hasNext()) {
|
while (itel.hasNext()) {
|
||||||
WatchableObject watch = itel.next();
|
WatchableObject watch = itel.next();
|
||||||
sentValues.add(watch.a());
|
int dataType = watch.a();
|
||||||
|
sentValues.add(dataType);
|
||||||
// Its sending the air metadata. This is the least commonly sent metadata which all entitys still share.
|
// Its sending the air metadata. This is the least commonly sent metadata which all entitys still share.
|
||||||
// I send my custom values if I see this!
|
// I send my custom values if I see this!
|
||||||
if (watch.a() == 1)
|
if (dataType == 1)
|
||||||
sendAllCustom = true;
|
sendAllCustom = true;
|
||||||
if (entityValues.containsKey(watch.a())) {
|
if (entityValues.containsKey(dataType)) {
|
||||||
if (entityValues.get(watch.a()) == null)
|
if (entityValues.get(dataType) == null)
|
||||||
continue;
|
continue;
|
||||||
Object value = entityValues.get(watch.a());
|
Object value = entityValues.get(dataType);
|
||||||
boolean doD = watch.d();
|
boolean doD = watch.d();
|
||||||
watch = new WatchableObject(classTypes.get(value.getClass()), watch.a(), value);
|
watch = new WatchableObject(classTypes.get(value.getClass()), dataType, value);
|
||||||
if (!doD)
|
if (!doD)
|
||||||
watch.a(false);
|
watch.a(false);
|
||||||
} else {
|
} else {
|
||||||
boolean doD = watch.d();
|
boolean doD = watch.d();
|
||||||
watch = new WatchableObject(watch.c(), watch.a(), watch.b());
|
watch = new WatchableObject(watch.c(), dataType, watch.b());
|
||||||
if (!doD)
|
if (!doD)
|
||||||
watch.a(false);
|
watch.a(false);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user