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

Paper experimental fix

Browse Source
This commit is contained in:
libraryaddict 2019-11-10 22:44:02 +13:00
parent 9cc6889f7d
commit ec6512aa77
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@ -86,6 +86,7 @@ public class DisguiseUtilities {
private static long velocityTime; private static long velocityTime;
private static int velocityID; private static int velocityID;
private static HashMap<UUID, ArrayList<Integer>> disguiseLoading = new HashMap<>(); private static HashMap<UUID, ArrayList<Integer>> disguiseLoading = new HashMap<>();
private static boolean runningPaper = Bukkit.getServer().getBukkitVersion().contains("Paper");
public static void setPlayerVelocity(Player player) { public static void setPlayerVelocity(Player player) {
velocityID = player.getEntityId(); velocityID = player.getEntityId();
@ -736,22 +737,6 @@ public class DisguiseUtilities {
}, LibsDisguises.getInstance().getConfig().getBoolean("ContactMojangServers", true)); }, LibsDisguises.getInstance().getConfig().getBoolean("ContactMojangServers", true));
} }
/**
* Pass in a set, check if it's a hashset. If it's not, return false. If you pass in something else, you failed.
*
* @param obj
* @return
*/
private static boolean isHashSet(Object obj) {
if (obj instanceof HashSet)
return true; // It's Spigot/Bukkit
if (obj instanceof Set)
return false; // It's PaperSpigot/SportsBukkit
throw new IllegalArgumentException("Object passed was not either a hashset or set!");
}
/** /**
* Thread safe to use. This returns a GameProfile. And if its GameProfile doesn't have a skin blob. Then it does * Thread safe to use. This returns a GameProfile. And if its GameProfile doesn't have a skin blob. Then it does
* a lookup * a lookup
@ -1255,11 +1240,12 @@ public class DisguiseUtilities {
Object entityTrackerEntry = ReflectionManager.getEntityTrackerEntry(player); Object entityTrackerEntry = ReflectionManager.getEntityTrackerEntry(player);
if (entityTrackerEntry != null) { if (entityTrackerEntry != null) {
// If the tracker exists. Remove himself from his tracker
if (runningPaper) {
Object trackedPlayersObj = ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayers") Object trackedPlayersObj = ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayers")
.get(entityTrackerEntry); .get(entityTrackerEntry);
// If the tracker exists. Remove himself from his tracker
if (isHashSet(trackedPlayersObj)) {
((Set<Object>) trackedPlayersObj).remove(ReflectionManager.getNmsEntity(player)); ((Set<Object>) trackedPlayersObj).remove(ReflectionManager.getNmsEntity(player));
} else { } else {
((Map<Object, Object>) ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayerMap") ((Map<Object, Object>) ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayerMap")
@ -1545,12 +1531,12 @@ public class DisguiseUtilities {
setupSelfDisguiseScoreboard(player); setupSelfDisguiseScoreboard(player);
// Check for code differences in PaperSpigot vs Spigot
if (runningPaper) {
// Add himself to his own entity tracker // Add himself to his own entity tracker
Object trackedPlayersObj = ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayers") Object trackedPlayersObj = ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayers")
.get(entityTrackerEntry); .get(entityTrackerEntry);
// Check for code differences in PaperSpigot vs Spigot
if (isHashSet(trackedPlayersObj)) {
((Set<Object>) trackedPlayersObj).add(ReflectionManager.getNmsEntity(player)); ((Set<Object>) trackedPlayersObj).add(ReflectionManager.getNmsEntity(player));
} else { } else {
((Map<Object, Object>) ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayerMap") ((Map<Object, Object>) ReflectionManager.getNmsField("EntityTrackerEntry", "trackedPlayerMap")