diff --git a/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch index 2b4fc92bdf..505e76fa8c 100644 --- a/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch +++ b/Spigot-Server-Patches/Avoid-blocking-on-Network-Manager-creation.patch @@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + private final List pending = Collections.synchronizedList(Lists.newArrayList()); + private void addPending() { + synchronized (pending) { -+ synchronized (this.h) { // Paper // OBFHELPER - List of network managers ++ synchronized (this.h) { // Paper - OBFHELPER - List of network managers + this.h.addAll(pending); + pending.clear(); + } diff --git a/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch b/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch index 15d2315330..7b41135e07 100644 --- a/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch +++ b/Spigot-Server-Patches/Fix-Chunk-Unload-Queue-Issues.patch @@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private int x; private ConcurrentLinkedQueue y; - public boolean d; -+ public boolean d;public void setShouldUnload(boolean unload) { this.d = unload; } public boolean isUnloading() { return d; } // Paper // OBFHELPER ++ public boolean d;public void setShouldUnload(boolean unload) { this.d = unload; } public boolean isUnloading() { return d; } // Paper - OBFHELPER protected gnu.trove.map.hash.TObjectIntHashMap entityCount = new gnu.trove.map.hash.TObjectIntHashMap(); // Spigot // Paper start diff --git a/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index d8a667d591..0ec488e6c1 100644 --- a/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 Iterator iterator = this.trackedPlayers.iterator(); // CraftBukkit diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 0000000000000000000000000000000000000000..00000000000000000000000000000000000000007 100644 +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { @@ -91,7 +91,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 return nbttagcompound; } -+ public void updateSeenPlayers(EntityHuman entityhuman, ItemStack itemstack) { a(entityhuman, itemstack); } // Paper // OBFHELPER ++ public void updateSeenPlayers(EntityHuman entityhuman, ItemStack itemstack) { a(entityhuman, itemstack); } // Paper - OBFHELPER public void a(EntityHuman entityhuman, ItemStack itemstack) { if (!this.j.containsKey(entityhuman)) { WorldMap.WorldMapHumanTracker worldmap_worldmaphumantracker = new WorldMap.WorldMapHumanTracker(entityhuman); diff --git a/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch b/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch index fdba9c9b1f..3c38720406 100644 --- a/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch +++ b/Spigot-Server-Patches/Improve-Minecraft-Hopper-Performance.patch @@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.g = i; } -+ boolean isCooledDown() { return o(); } // Paper // OBFHELPER ++ boolean isCooledDown() { return o(); } // Paper - OBFHELPER public boolean o() { return this.g > 0; } diff --git a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch index c4de9a401c..b048066377 100644 --- a/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/LootTable-API-Replenishable-Lootables-Feature.patch @@ -441,7 +441,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 private boolean b = true; private MinecraftKey c; - private long d; -+ private long d;public long getLootTableSeed() { return d; } // Paper // OBFHELPER ++ private long d;public long getLootTableSeed() { return d; } // Paper - OBFHELPER // CraftBukkit start public List transaction = new java.util.ArrayList(); @@ -490,14 +490,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } -+ public void setLootTable(MinecraftKey key, long seed) { a(key, seed);} // Paper // OBFHELPER ++ public void setLootTable(MinecraftKey key, long seed) { a(key, seed);} // Paper - OBFHELPER public void a(MinecraftKey minecraftkey, long i) { this.c = minecraftkey; this.d = i; } + -+ public MinecraftKey getLootTableKey() { return b(); } // Paper // OBFHELPER ++ public MinecraftKey getLootTableKey() { return b(); } // Paper - OBFHELPER public MinecraftKey b() { return this.c; } @@ -558,7 +558,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 protected MinecraftKey m; - protected long n; -+ protected long n; public long getLootTableSeed() { return n; } // Paper // OBFHELPER ++ protected long n; public long getLootTableSeed() { return n; } // Paper - OBFHELPER public TileEntityLootable() {} @@ -603,12 +603,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } -+ public MinecraftKey getLootTableKey() { return b(); } // Paper // OBFHELPER ++ public MinecraftKey getLootTableKey() { return b(); } // Paper - OBFHELPER public MinecraftKey b() { return this.m; } -+ public void setLootTable(MinecraftKey key, long seed) { a(key, seed);} // Paper // OBFHELPER ++ public void setLootTable(MinecraftKey key, long seed) { a(key, seed);} // Paper - OBFHELPER public void a(MinecraftKey minecraftkey, long i) { this.m = minecraftkey; this.n = i; diff --git a/Spigot-Server-Patches/MC-Utils.patch b/Spigot-Server-Patches/MC-Utils.patch index 8eba95d7c4..447f533d15 100644 --- a/Spigot-Server-Patches/MC-Utils.patch +++ b/Spigot-Server-Patches/MC-Utils.patch @@ -238,13 +238,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.map.put(s, new NBTTagLong(i)); } -+ public void setUUID(String prefix, UUID uuid) { a(prefix, uuid); } // Paper // OBFHELPER ++ public void setUUID(String prefix, UUID uuid) { a(prefix, uuid); } // Paper - OBFHELPER public void a(String s, UUID uuid) { this.setLong(s + "Most", uuid.getMostSignificantBits()); this.setLong(s + "Least", uuid.getLeastSignificantBits()); } -+ public UUID getUUID(String prefix) { return a(prefix); } // Paper // OBFHELPER ++ public UUID getUUID(String prefix) { return a(prefix); } // Paper - OBFHELPER @Nullable public UUID a(String s) { return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least")); diff --git a/Spigot-Server-Patches/Make-entities-look-for-hoppers.patch b/Spigot-Server-Patches/Make-entities-look-for-hoppers.patch index f1250e38ac..1201f66821 100644 --- a/Spigot-Server-Patches/Make-entities-look-for-hoppers.patch +++ b/Spigot-Server-Patches/Make-entities-look-for-hoppers.patch @@ -99,7 +99,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } -+ public final boolean intersects(AxisAlignedBB intersecting) { return this.b(intersecting); } ++ public final boolean intersects(AxisAlignedBB intersecting) { return this.b(intersecting); } // Paper - OBFHELPER public boolean b(AxisAlignedBB axisalignedbb) { return this.a(axisalignedbb.a, axisalignedbb.b, axisalignedbb.c, axisalignedbb.d, axisalignedbb.e, axisalignedbb.f); } diff --git a/Spigot-Server-Patches/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index c80ae197c5..f452bd26f2 100644 --- a/Spigot-Server-Patches/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -18,6 +18,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + useVanillaScoreboardColoring = getBoolean("use-vanilla-world-scoreboard-name-coloring", false); + } } +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener { + return this.getFlag(5); + } + ++ @Nullable public ScoreboardTeamBase getTeam() { return this.aQ(); } // Paper - OBFHELPER + @Nullable + public ScoreboardTeamBase aQ() { + if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java @@ -30,7 +42,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper Start - (Meh) Support for vanilla world scoreboard name coloring + String displayName = event.getPlayer().getDisplayName(); + if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) { -+ displayName = ScoreboardTeam.getPlayerDisplayName(this.player.aQ(), player.getDisplayName()); ++ displayName = ScoreboardTeam.getPlayerDisplayName(this.player.getTeam(), player.getDisplayName()); + } + + s = String.format(event.getFormat(), displayName, event.getMessage()); diff --git a/Spigot-Server-Patches/Remove-the-item-from-the-correct-hand-when-spawn-egg.patch b/Spigot-Server-Patches/Remove-the-item-from-the-correct-hand-when-spawn-egg.patch index 5a1ce87df7..2013b14c08 100644 --- a/Spigot-Server-Patches/Remove-the-item-from-the-correct-hand-when-spawn-egg.patch +++ b/Spigot-Server-Patches/Remove-the-item-from-the-correct-hand-when-spawn-egg.patch @@ -25,7 +25,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } } -+ public void setHeldItem(EnumHand enumhand, @Nullable ItemStack itemstack) { a(enumhand, itemstack); } // Paper // OBFHELPER ++ public void setHeldItem(EnumHand enumhand, @Nullable ItemStack itemstack) { a(enumhand, itemstack); } // Paper - OBFHELPER public void a(EnumHand enumhand, @Nullable ItemStack itemstack) { if (enumhand == EnumHand.MAIN_HAND) { this.setSlot(EnumItemSlot.MAINHAND, itemstack); diff --git a/Spigot-Server-Patches/SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch b/Spigot-Server-Patches/SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch index e4b98f52c6..e6697655da 100644 --- a/Spigot-Server-Patches/SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch +++ b/Spigot-Server-Patches/SPIGOT-1903-Update-PlayerConnection-on-teleporting-p.patch @@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } - private void d() { -+ public void captureCurrentPosition() { d(); } private void d() { // Paper // OBFHELPER ++ public void captureCurrentPosition() { d(); } private void d() { // Paper - OBFHELPER this.l = this.player.locX; this.m = this.player.locY; this.n = this.player.locZ;