From 8fee475387a008001499b1359730b777e44a057b Mon Sep 17 00:00:00 2001 From: Ivan Pekov Date: Thu, 26 Nov 2020 11:52:33 +0200 Subject: [PATCH] Updated Upstream and Sidestream(s) (Tuinity/Akarin/Purpur) Upstream/An Sidestream has released updates that appears to apply and compile correctly This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing. Tuinity Changes: ff785fc Updated Upstream (Paper) Akarin Changes: 2dab0a4 Removed gradle 72e3c4a Update README.md bbad638 Update README.md bbdea8e Update Jenkinsfile bb9db8b Updated tuinity to spottedleaf repo 6961481 Updated Tuinity branch de97830 Updated Tuinity 62d4b43 Update SUPPORT.md 21fffd0 Update README.md 4bd120b Merge pull request #186 from adsa562/patch-1 1f8eccf add demo server 630ea72 Updated Tuinity 59fae5a Made 1.15.2 build again bd703ba Allowed building for dirs that have spaces a339866 Update SUPPORT.md db61690 stated that it is not a bedrock server software df7efd2 Added Jenkinsfile 75b7f13 removed broken patch 19387b2 Updated Artifacts URL c5a7778 fixed build 3abf7a7 Fixed Initialize step 2d3ea37 Updated Tuinity and Paper 220d1b8 Removed patch 0019 - breaks upstream 1ccf615 Added tuinity branch to gitmodules c5e73c7 Updated Upstream (Tuinity) 3cd947f Updated Upstream (Tuinity) 14df550 cleanup scripts/importSources.sh 49d9af7 revert a broken patch 630492a revert a broken patch cb5ea51 Fixed build failure 826c0f0 Updated 1.15.2 jenkinsfile to 1.16.1 574b206 Update SUPPORT.md 90e3f89 Update SUPPORT.md c2a5f66 fix b30241b fix 4e06aea fix 284809b 1.16.1 Purpur Changes: 096971d Rename kelp/vines options to make more sense 8ea89f9 Fix broken methods in purpur config c505cf7 Updated Upstream (Paper) 695f3ac Add configurable snowball damage 2d04fb5 Updated Upstream (Paper) badfd60 Rebuild patches f3aff1b Merge branch 'ver/1.16.4' of github.com:pl3xgaming/Purpur into ver/1.16.4 cfcf7d7 Add critical hit check to EntityDamagedByEntityEvent 0b48c6c Add config for allowing Endermen to despawn even while holding a block 1349e72 Updated Upstream (Tuinity) 651105e Kelp weeping and twisting vines configurable max length 058399c Updated Upstream (Tuinity) 3e0a758 Add twisting and weeping vines growth rates --- .gitmodules | 2 +- Akarin | 2 +- PATCHES.md | 1 - Purpur | 2 +- Tuinity | 2 +- patches/Akarin/server.txt | 2 +- .../server/0001-Yatopia-Server-Fixes.patch | 1120 +---------------- patches/server/0003-Brandings.patch | 2 +- .../server/0006-Add-last-tick-time-API.patch | 8 +- .../server/0007-Yatopia-configuration.patch | 4 +- ...8-Per-entity-type-collision-settings.patch | 2 +- patches/server/0014-lithium-enum_values.patch | 2 +- .../0015-lithium-MixinGoalSelector.patch | 2 +- .../0018-Option-for-simpler-Villagers.patch | 4 +- ...0021-Optimize-TileEntity-load-unload.patch | 2 +- .../0026-Fix-lead-fall-dmg-config.patch | 2 +- ...ze-some-stuff-in-WorldServer-ticking.patch | 2 +- .../0029-Add-timings-for-Pathfinder.patch | 2 +- ...-Fix-LightEngineThreaded-memory-leak.patch | 2 +- ...Respect-PlayerKickEvent-leaveMessage.patch | 2 +- ...st-command-for-multiple-additions-re.patch | 2 +- ...-PaperPR-Fix-merging-spawning-values.patch | 2 +- .../0052-Configurable-flight-checks.patch | 2 +- ...0064-Configurable-criterion-triggers.patch | 2 +- .../0065-Configurable-BlockPhysicsEvent.patch | 2 +- .../0068-Configurable-movement-checks.patch | 2 +- scripts/fetchUpstream.sh | 2 +- 27 files changed, 58 insertions(+), 1123 deletions(-) diff --git a/.gitmodules b/.gitmodules index c2c79fd0..adf662af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "Akarin"] path = Akarin url = https://github.com/Akarin-project/Akarin.git - branch = 1.16.2 + branch = 1.16.3 [submodule "Purpur"] path = Purpur url = https://github.com/pl3xgaming/Purpur.git diff --git a/Akarin b/Akarin index bd703baa..2dab0a41 160000 --- a/Akarin +++ b/Akarin @@ -1 +1 @@ -Subproject commit bd703baa5f16e790bfb1e49866e7f959b6ae8891 +Subproject commit 2dab0a410cf71a7eb660580ad88487f96dace3d7 diff --git a/PATCHES.md b/PATCHES.md index 20b7af27..b05f3a04 100644 --- a/PATCHES.md +++ b/PATCHES.md @@ -104,7 +104,6 @@ # Patches | server | Purpur config files | William Blake Galbreath | | | server | Redirect Configs | tr7zw | | | server | Remove some streams and object allocations | Phoenix616 | | -| server | Remove vanilla profiler callers | Sotr | | | server | Respect PlayerKickEvent leaveMessage | Ivan Pekov | | | server | Send more packets immediately | MrIvanPlays | | | server | Shutdown Bootstrap thread pool | foss-mc | | diff --git a/Purpur b/Purpur index b8fb7ff5..096971dc 160000 --- a/Purpur +++ b/Purpur @@ -1 +1 @@ -Subproject commit b8fb7ff5b5de02aa0c46d76d65f6f481f2fd6929 +Subproject commit 096971dce8fda63b172d49c25b98ba7606fe978d diff --git a/Tuinity b/Tuinity index 1421ccab..ff785fc1 160000 --- a/Tuinity +++ b/Tuinity @@ -1 +1 @@ -Subproject commit 1421ccab6eb9a84975d0ca142e9054699010189b +Subproject commit ff785fc1d9b45a74c3eeadfc09f8e6de5289f568 diff --git a/patches/Akarin/server.txt b/patches/Akarin/server.txt index 0b740613..36ed5702 100644 --- a/patches/Akarin/server.txt +++ b/patches/Akarin/server.txt @@ -1 +1 @@ -Disable-the-Snooper&Avoid-double-I-O-operation-on-load-player-file&Remove-vanilla-profiler-callers&Swaps-the-predicate-order-of-collision \ No newline at end of file +Disable-the-Snooper&Avoid-double-I-O-operation-on-load-player-file&Swaps-the-predicate-order-of-collision \ No newline at end of file diff --git a/patches/server/0001-Yatopia-Server-Fixes.patch b/patches/server/0001-Yatopia-Server-Fixes.patch index 4f13c8fe..6c5d56dd 100644 --- a/patches/server/0001-Yatopia-Server-Fixes.patch +++ b/patches/server/0001-Yatopia-Server-Fixes.patch @@ -4,35 +4,6 @@ Date: Sun, 25 Oct 2020 12:23:35 -0500 Subject: [PATCH] Yatopia-Server-Fixes -diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java -index dee9655b89d061ec8218ea2c54660c6003e8548f..253b73cfc597d4c7106d969be7b18c68166128ae 100644 ---- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java -+++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java -@@ -295,7 +295,7 @@ public final class PaperTickList extends TickListServer { // extend to avo - this.shortScheduledIndex = getNextIndex(this.shortScheduledIndex, SHORT_SCHEDULE_TICK_THRESHOLD); - - this.timingCleanup.stopTiming(); -- this.world.getMethodProfiler().exitEnter("ticking"); -+ //this.world.getMethodProfiler().exitEnter("ticking"); // Akarin - remove caller - this.timingTicking.startTiming(); - - for (final NextTickListEntry toTick : this.toTickThisTick) { -diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java.rej b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java.rej -deleted file mode 100644 -index c9fa39c5b4b013b56720e339463ffcb5fd3c13f9..0000000000000000000000000000000000000000 ---- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java.rej -+++ /dev/null -@@ -1,10 +0,0 @@ --diff a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java (rejected hunks) --@@ -283,7 +283,7 @@ public final class PaperTickList extends TickListServer { // extend to avo -- this.nextTick = this.world.getTime() + 1; -- -- this.timingCleanup.stopTiming(); --- this.world.getMethodProfiler().exitEnter("ticking"); --+ //this.world.getMethodProfiler().exitEnter("ticking"); // Akarin - remove caller -- this.timingTicking.startTiming(); -- -- for (final NextTickListEntry toTick : this.toTickThisTick) { diff --git a/src/main/java/de/minebench/origami/OrigamiConfig.java b/src/main/java/de/minebench/origami/OrigamiConfig.java index fe7330fabe386966c2d203a190a00a785ea21be0..537456a7427cddd6783f5b5d8ee2d655668c4c53 100644 --- a/src/main/java/de/minebench/origami/OrigamiConfig.java @@ -275,113 +246,8 @@ index 2291135eaef64c403183724cb6e413cd7e472672..6fcc7ed7c129e6a33386d65b37cbba4a public static long getAdjacent(int baseX, int baseY, int baseZ, EnumDirection enumdirection) { return asLong(baseX + enumdirection.getAdjacentX(), baseY + enumdirection.getAdjacentY(), baseZ + enumdirection.getAdjacentZ()); } // Paper public static long a(long i, EnumDirection enumdirection) { return a(i, enumdirection.getAdjacentX(), enumdirection.getAdjacentY(), enumdirection.getAdjacentZ()); -diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 426ea234638270358fdf9337ea373ab680f37326..6e4e183c3169a484f482d96ba3441eb16c2053d9 100644 ---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java -+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java -@@ -740,11 +740,11 @@ public class ChunkProviderServer extends IChunkProvider { - if (this.a(playerchunk, l)) { - GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); - -- gameprofilerfiller.enter("chunkLoad"); -+ //gameprofilerfiller.enter("chunkLoad"); // Akarin - remove caller - chunkMapDistance.delayDistanceManagerTick = false; // Paper - ensure this is never false - this.tickDistanceManager(); - playerchunk = this.getChunk(k); -- gameprofilerfiller.exit(); -+ //gameprofilerfiller.exit(); // Akarin - remove caller - if (this.a(playerchunk, l)) { - this.chunkMapDistance.removeTicketAtLevel(TicketType.REQUIRED_LOAD, chunkcoordintpair, l, identifier); // Tuinity - throw (IllegalStateException) SystemUtils.c((Throwable) (new IllegalStateException("No chunk holder after ticket has been added"))); -@@ -973,11 +973,11 @@ public class ChunkProviderServer extends IChunkProvider { - player.playerNaturallySpawnedEvent = event; - } - // Paper end - optimize isOutisdeRange -- this.world.getMethodProfiler().enter("pollingChunks"); -+ //this.world.getMethodProfiler().enter("pollingChunks"); // Akarin - remove caller - int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED); - boolean flag2 = world.ticksPerAnimalSpawns != 0L && worlddata.getTime() % world.ticksPerAnimalSpawns == 0L; // CraftBukkit - -- this.world.getMethodProfiler().enter("naturalSpawnCount"); -+ //this.world.getMethodProfiler().enter("naturalSpawnCount"); // Akarin - remove caller - this.world.timings.countNaturalMobs.startTiming(); // Paper - timings - int l = this.chunkMapDistance.b(); - // Paper start - per player mob spawning -@@ -1040,15 +1040,15 @@ public class ChunkProviderServer extends IChunkProvider { - iterator.finishedIterating(); - } - // Tuinity end - optimise chunk tick iteration -- this.world.getMethodProfiler().enter("customSpawners"); -+ //this.world.getMethodProfiler().enter("customSpawners"); // Akarin - remove caller - if (flag1) { - try (co.aikar.timings.Timing ignored = this.world.timings.miscMobSpawning.startTiming()) { // Paper - timings - this.world.doMobSpawning(this.allowMonsters, this.allowAnimals); - } // Paper - timings - } - -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - } - - // Tuinity start - controlled flush for entity tracker packets -diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java.rej b/src/main/java/net/minecraft/server/ChunkProviderServer.java.rej -deleted file mode 100644 -index c2b788bb29fdfec9b4b6768a42e32e5af966f0ae..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/ChunkProviderServer.java.rej -+++ /dev/null -@@ -1,48 +0,0 @@ --diff a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java (rejected hunks) --@@ -732,11 +732,11 @@ public class ChunkProviderServer extends IChunkProvider { -- if (this.a(playerchunk, l)) { -- GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler(); -- --- gameprofilerfiller.enter("chunkLoad"); --+ //gameprofilerfiller.enter("chunkLoad"); // Akarin - remove caller -- chunkMapDistance.delayDistanceManagerTick = false; // Paper - ensure this is never false -- this.tickDistanceManager(); -- playerchunk = this.getChunk(k); --- gameprofilerfiller.exit(); --+ //gameprofilerfiller.exit(); // Akarin - remove caller -- if (this.a(playerchunk, l)) { -- this.chunkMapDistance.removeTicketAtLevel(TicketType.REQUIRED_LOAD, chunkcoordintpair, l, identifier); // Tuinity -- throw (IllegalStateException) SystemUtils.c(new IllegalStateException("No chunk holder after ticket has been added")); --@@ -971,11 +971,11 @@ public class ChunkProviderServer extends IChunkProvider { -- player.lastEntitySpawnRadiusSquared = (double)((range << 4) * (range << 4)); // used in isOutsideRange -- } -- // Paper end - optimize isOutisdeRange --- this.world.getMethodProfiler().enter("pollingChunks"); --+ //this.world.getMethodProfiler().enter("pollingChunks"); // Akarin - remove caller -- int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED); -- boolean flag2 = world.ticksPerAnimalSpawns != 0L && worlddata.getTime() % world.ticksPerAnimalSpawns == 0L; // CraftBukkit -- --- this.world.getMethodProfiler().enter("naturalSpawnCount"); --+ //this.world.getMethodProfiler().enter("naturalSpawnCount"); // Akarin - remove caller -- this.world.timings.countNaturalMobs.startTiming(); // Paper - timings -- int l = this.chunkMapDistance.b(); -- // Paper start - per player mob spawning --@@ -1048,15 +1048,15 @@ public class ChunkProviderServer extends IChunkProvider { -- } -- } -- // Tuinity end - optimise chunk tick iteration --- this.world.getMethodProfiler().enter("customSpawners"); --+ //this.world.getMethodProfiler().enter("customSpawners"); // Akarin - remove caller -- if (flag1) { -- try (co.aikar.timings.Timing ignored = this.world.timings.miscMobSpawning.startTiming()) { // Paper - timings -- this.world.doMobSpawning(this.allowMonsters, this.allowAnimals); -- } // Paper - timings -- } -- --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- } -- -- // Tuinity start - controlled flush for entity tracker packets diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4acdb6b479e87562b93b07a40398a7bb19186006..f657ace0000e7f4850088e04e7bfc8dd0be69a6c 100644 +index a02f7a39ee15d0478645a99d250a44de662011dc..6cdff124ac660134b1bf378f4f163ae8010d2ef9 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -440,7 +440,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -393,672 +259,8 @@ index 4acdb6b479e87562b93b07a40398a7bb19186006..f657ace0000e7f4850088e04e7bfc8dd } protected void af() { -@@ -523,7 +523,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - } - - this.justCreated = false; -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - } - - public void resetPortalCooldown() { -@@ -2421,7 +2421,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - WorldServer worldserver1 = minecraftserver.getWorldServer(resourcekey); - - if (true && !this.isPassenger() && this.portalTicks++ >= i) { // CraftBukkit -- this.world.getMethodProfiler().enter("portal"); -+ //this.world.getMethodProfiler().enter("portal"); // Akarin - remove caller - this.portalTicks = i; - this.resetPortalCooldown(); - // CraftBukkit start -@@ -2431,7 +2431,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - this.b(worldserver1); - } - // CraftBukkit end -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - } - - this.inPortal = false; -@@ -2818,14 +2818,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - } - // Paper end - if (this.world instanceof WorldServer && !this.dead) { -- this.world.getMethodProfiler().enter("changeDimension"); -+ //this.world.getMethodProfiler().enter("changeDimension"); // Akarin - remove caller - // CraftBukkit start - // this.decouple(); - if (worldserver == null) { - return null; - } - // CraftBukkit end -- this.world.getMethodProfiler().enter("reposition"); -+ //this.world.getMethodProfiler().enter("reposition"); // Akarin - remove caller - ShapeDetectorShape shapedetectorshape = (location == null) ? this.a(worldserver) : new ShapeDetectorShape(new Vec3D(location.getX(), location.getY(), location.getZ()), Vec3D.ORIGIN, this.yaw, this.pitch, worldserver, null); // CraftBukkit - - if (shapedetectorshape == null) { -@@ -2858,10 +2858,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke - } - - this.bN(); -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - ((WorldServer) this.world).resetEmptyTime(); - worldserver.resetEmptyTime(); -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - return entity; - } - } else { -diff --git a/src/main/java/net/minecraft/server/Entity.java.rej b/src/main/java/net/minecraft/server/Entity.java.rej -deleted file mode 100644 -index 2ed1659910c17646f3407a2245109501bc4c568a..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/Entity.java.rej -+++ /dev/null -@@ -1,85 +0,0 @@ --diff a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java (rejected hunks) --@@ -523,7 +523,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke -- } -- -- this.justCreated = false; --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- } -- -- // Paper start --@@ -679,7 +679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke -- } -- } -- --- this.world.getMethodProfiler().enter("move"); --+ //this.world.getMethodProfiler().enter("move"); // Akarin - remove caller -- if (this.x.g() > 1.0E-7D) { -- vec3d = vec3d.h(this.x); -- this.x = Vec3D.a; --@@ -688,7 +688,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke -- // Paper start - ignore movement changes while inactive. -- if (isTemporarilyActive && !(this instanceof EntityItem || this instanceof EntityMinecartAbstract) && vec3d == getMot() && enummovetype == EnumMoveType.SELF) { -- setMot(Vec3D.a); --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- return; -- } -- // Paper end --@@ -2376,7 +2376,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke -- WorldServer worldserver1 = minecraftserver.getWorldServer(resourcekey); -- -- if (true && !this.isPassenger() && this.portalTicks++ >= i) { // CraftBukkit --- this.world.getMethodProfiler().enter("portal"); --+ //this.world.getMethodProfiler().enter("portal"); // Akarin - remove caller -- this.portalTicks = i; -- this.portalCooldown = this.getDefaultPortalCooldown(); -- // CraftBukkit start --@@ -2386,7 +2386,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke -- this.a(worldserver1); -- } -- // CraftBukkit end --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- } -- -- this.inPortal = false; --@@ -2770,14 +2770,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke -- } -- // Paper end -- if (this.world instanceof WorldServer && !this.dead) { --- this.world.getMethodProfiler().enter("changeDimension"); --+ //this.world.getMethodProfiler().enter("changeDimension"); // Akarin - remove caller -- // CraftBukkit start -- // this.decouple(); -- if (worldserver == null){ -- return null; -- } -- // CraftBukkit end --- this.world.getMethodProfiler().enter("reposition"); --+ //this.world.getMethodProfiler().enter("reposition"); // Akarin - remove caller -- Vec3D vec3d = this.getMot(); -- float f = 0.0F; -- BlockPosition blockposition = location; // CraftBukkit --@@ -2856,7 +2856,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke -- this.decouple(); -- // CraftBukkit end -- --- this.world.getMethodProfiler().exitEnter("reloading"); --+ //this.world.getMethodProfiler().exitEnter("reloading"); // Akarin - remove caller -- Entity entity = this.getEntityType().a((World) worldserver); -- -- if (entity != null) { --@@ -2878,10 +2878,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke -- } -- -- this.bJ(); --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- ((WorldServer) this.world).resetEmptyTime(); -- worldserver.resetEmptyTime(); --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- return entity; -- } else { -- return null; -diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java -index f6797925365836b6c2d3d2c48c746a4d58e28bf3..3f50afcaec6d1523a5baca4102a08ee058b89dd9 100644 ---- a/src/main/java/net/minecraft/server/EntityHoglin.java -+++ b/src/main/java/net/minecraft/server/EntityHoglin.java -@@ -13,7 +13,7 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin { - public int conversionTicks = 0; - public boolean cannotBeHunted = false; - protected static final ImmutableList>> bo = ImmutableList.of(SensorType.c, SensorType.d, SensorType.n, SensorType.m); -- protected static final ImmutableList> bp = ImmutableList.of(MemoryModuleType.BREED_TARGET, MemoryModuleType.MOBS, MemoryModuleType.VISIBLE_MOBS, MemoryModuleType.NEAREST_VISIBLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, MemoryModuleType.LOOK_TARGET, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.ATTACK_TARGET, MemoryModuleType.ATTACK_COOLING_DOWN, MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, new MemoryModuleType[]{MemoryModuleType.AVOID_TARGET, MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, MemoryModuleType.NEAREST_VISIBLE_ADULT_HOGLINS, MemoryModuleType.NEAREST_VISIBLE_ADULY, MemoryModuleType.NEAREST_REPELLENT, MemoryModuleType.PACIFIED}); -+ protected static final ImmutableList> bp = ImmutableList.of(MemoryModuleType.BREED_TARGET, MemoryModuleType.MOBS, MemoryModuleType.VISIBLE_MOBS, MemoryModuleType.NEAREST_VISIBLE_PLAYER, MemoryModuleType.NEAREST_VISIBLE_TARGETABLE_PLAYER, MemoryModuleType.LOOK_TARGET, MemoryModuleType.WALK_TARGET, MemoryModuleType.CANT_REACH_WALK_TARGET_SINCE, MemoryModuleType.PATH, MemoryModuleType.ATTACK_TARGET, MemoryModuleType.ATTACK_COOLING_DOWN, MemoryModuleType.NEAREST_VISIBLE_ADULT_PIGLIN, new MemoryModuleType[]{MemoryModuleType.AVOID_TARGET, MemoryModuleType.VISIBLE_ADULT_PIGLIN_COUNT, MemoryModuleType.VISIBLE_ADULT_HOGLIN_COUNT, MemoryModuleType.NEAREST_VISIBLE_ADULT_HOGLINS, MemoryModuleType.NEAREST_VISIBLE_ADULY, MemoryModuleType.NEAREST_REPELLENT, MemoryModuleType.PACIFIED}); // Yatopia - decompile fix - - public EntityHoglin(EntityTypes entitytypes, World world) { - super(entitytypes, world); -@@ -77,14 +77,14 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin { - - @Override - public BehaviorController getBehaviorController() { -- return super.getBehaviorController(); -+ return (BehaviorController) super.getBehaviorController(); // Yatopia - decompile fix - } - - @Override - protected void mobTick() { -- this.world.getMethodProfiler().enter("hoglinBrain"); -- this.getBehaviorController().a((WorldServer) this.world, (EntityLiving) this); -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().enter("hoglinBrain"); // Akarin - remove caller -+ this.getBehaviorController().a((WorldServer) this.world, this); // Yatopia - decompile fix -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - HoglinAI.a(this); - if (this.isConverting()) { - ++this.conversionTicks; -@@ -259,7 +259,7 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin { - - @Override - protected SoundEffect getSoundAmbient() { -- return this.world.isClientSide ? null : (SoundEffect) HoglinAI.b(this).orElse((Object) null); -+ return this.world.isClientSide ? null : (SoundEffect) HoglinAI.b(this).orElse(null); // Yatopia - decompile fix - } - - @Override -diff --git a/src/main/java/net/minecraft/server/EntityHoglin.java.rej b/src/main/java/net/minecraft/server/EntityHoglin.java.rej -deleted file mode 100644 -index be7a4b07540f6cc29c9ed76668bc1eaf9850013c..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/EntityHoglin.java.rej -+++ /dev/null -@@ -1,13 +0,0 @@ --diff a/src/main/java/net/minecraft/server/EntityHoglin.java b/src/main/java/net/minecraft/server/EntityHoglin.java (rejected hunks) --@@ -83,9 +83,9 @@ public class EntityHoglin extends EntityAnimal implements IMonster, IOglin { -- -- @Override -- protected void mobTick() { --- this.world.getMethodProfiler().enter("hoglinBrain"); --+ //this.world.getMethodProfiler().enter("hoglinBrain"); // Akarin - remove caller -- this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- HoglinAI.a(this); -- if (this.eO()) { -- ++this.bz; -diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 66a82793860986ac7b9a1e9d278b71552978933d..bee5b047a5b44a7eb1ea860b5573d8a04f788580 100644 ---- a/src/main/java/net/minecraft/server/EntityInsentient.java -+++ b/src/main/java/net/minecraft/server/EntityInsentient.java -@@ -242,13 +242,13 @@ public abstract class EntityInsentient extends EntityLiving { - @Override - public void entityBaseTick() { - super.entityBaseTick(); -- this.world.getMethodProfiler().enter("mobBaseTick"); -+ //this.world.getMethodProfiler().enter("mobBaseTick"); // Akarin - remove caller - if (this.isAlive() && this.random.nextInt(1000) < this.e++) { - this.m(); - this.F(); - } - incrementTicksSinceLastInteraction(); // Purpur -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - } - - // Purpur start -@@ -785,30 +785,30 @@ public abstract class EntityInsentient extends EntityLiving { - return; - } - // Paper end -- this.world.getMethodProfiler().enter("sensing"); -+ //this.world.getMethodProfiler().enter("sensing"); // Akarin - remove caller - this.bo.a(); -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("targetSelector"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("targetSelector"); // Akarin - remove caller - this.targetSelector.doTick(); -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("goalSelector"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("goalSelector"); // Akarin - remove caller - this.goalSelector.doTick(); -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("navigation"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("navigation"); // Akarin - remove caller - this.navigation.c(); -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("mob tick"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller - this.mobTick(); -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("controls"); -- this.world.getMethodProfiler().enter("move"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("controls"); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("move"); // Akarin - remove caller - this.moveController.a(); -- this.world.getMethodProfiler().exitEnter("look"); -+ //this.world.getMethodProfiler().exitEnter("look"); // Akarin - remove caller - this.lookController.a(); -- this.world.getMethodProfiler().exitEnter("jump"); -+ //this.world.getMethodProfiler().exitEnter("jump"); // Akarin - remove caller - this.bi.b(); -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - this.M(); - } - -diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java.rej b/src/main/java/net/minecraft/server/EntityInsentient.java.rej -deleted file mode 100644 -index bccb7cd89241ca30549f5442a4ef9847cfdb67a9..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/EntityInsentient.java.rej -+++ /dev/null -@@ -1,64 +0,0 @@ --diff a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java (rejected hunks) --@@ -241,13 +241,13 @@ public abstract class EntityInsentient extends EntityLiving { -- @Override -- public void entityBaseTick() { -- super.entityBaseTick(); --- this.world.getMethodProfiler().enter("mobBaseTick"); --+ //this.world.getMethodProfiler().enter("mobBaseTick"); // Akarin - remove caller -- if (this.isAlive() && this.random.nextInt(1000) < this.e++) { -- this.eJ(); -- this.F(); -- } -- --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- } -- -- @Override --@@ -747,30 +747,30 @@ public abstract class EntityInsentient extends EntityLiving { -- return; -- } -- // Paper end --- this.world.getMethodProfiler().enter("sensing"); --+ //this.world.getMethodProfiler().enter("sensing"); // Akarin - remove caller -- this.bv.a(); --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("targetSelector"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("targetSelector"); // Akarin - remove caller -- this.targetSelector.doTick(); --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("goalSelector"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("goalSelector"); // Akarin - remove caller -- this.goalSelector.doTick(); --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("navigation"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("navigation"); // Akarin - remove caller -- this.navigation.c(); --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("mob tick"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("mob tick"); // Akarin - remove caller -- this.mobTick(); --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("controls"); --- this.world.getMethodProfiler().enter("move"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("controls"); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("move"); // Akarin - remove caller -- this.moveController.a(); --- this.world.getMethodProfiler().exitEnter("look"); --+ //this.world.getMethodProfiler().exitEnter("look"); // Akarin - remove caller -- this.lookController.a(); --- this.world.getMethodProfiler().exitEnter("jump"); --+ //this.world.getMethodProfiler().exitEnter("jump"); // Akarin - remove caller -- this.bp.b(); --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- this.M(); -- } -- -diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 009ac0fa6474b89e69db11377202e59cdf4a61d6..9ae1b9b40324da3d7a35bf8bbd6b3bea242f2b73 100644 ---- a/src/main/java/net/minecraft/server/EntityLiving.java -+++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -366,7 +366,7 @@ public abstract class EntityLiving extends Entity { - this.aD = this.aC; - this.lastYaw = this.yaw; - this.lastPitch = this.pitch; -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - } - - public boolean cN() { -@@ -2515,10 +2515,10 @@ public abstract class EntityLiving extends Entity { - } - - this.aK += (f3 - this.aK) * 0.3F; -- this.world.getMethodProfiler().enter("headTurn"); -+ //this.world.getMethodProfiler().enter("headTurn"); // Akarin - remove caller - f2 = this.f(f1, f2); -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("rangeChecks"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("rangeChecks"); // Akarin - remove caller - - while (this.yaw - this.lastYaw < -180.0F) { - this.lastYaw -= 360.0F; -@@ -2552,7 +2552,7 @@ public abstract class EntityLiving extends Entity { - this.aD += 360.0F; - } - -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - this.aL += f2; - if (this.isGliding()) { - ++this.be; -@@ -2751,19 +2751,19 @@ public abstract class EntityLiving extends Entity { - } - - this.setMot(d4, d5, d6); -- this.world.getMethodProfiler().enter("ai"); -+ //this.world.getMethodProfiler().enter("ai"); // Akarin - remove caller - if (this.isFrozen()) { - this.jumping = false; - this.aR = 0.0F; - this.aT = 0.0F; - } else if (this.doAITick()) { -- this.world.getMethodProfiler().enter("newAi"); -+ //this.world.getMethodProfiler().enter("newAi"); // Akarin - remove caller - this.doTick(); - this.world.getMethodProfiler().exit(); - } - -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("jump"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("jump"); // Akarin - remove caller - if (this.jumping && this.cT()) { - double d7; - -@@ -2790,8 +2790,8 @@ public abstract class EntityLiving extends Entity { - this.jumpTicks = 0; - } - -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("travel"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("travel"); // Akarin - remove caller - this.aR *= 0.98F; - this.aT *= 0.98F; - this.r(); -@@ -2800,15 +2800,15 @@ public abstract class EntityLiving extends Entity { - // SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper - this.g(new Vec3D((double) this.aR, (double) this.aS, (double) this.aT)); - // SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper -- this.world.getMethodProfiler().exit(); -- this.world.getMethodProfiler().enter("push"); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -+ //this.world.getMethodProfiler().enter("push"); // Akarin - remove caller - if (this.bf > 0) { - --this.bf; - this.a(axisalignedbb, this.getBoundingBox()); - } - - this.collideNearby(); -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - if (!this.world.isClientSide && this.dO() && this.aG()) { - this.damageEntity(DamageSource.DROWN, 1.0F); - } -diff --git a/src/main/java/net/minecraft/server/EntityLiving.java.rej b/src/main/java/net/minecraft/server/EntityLiving.java.rej -deleted file mode 100644 -index 947d12a17358d209be65c828e9dd297c54af91ac..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/EntityLiving.java.rej -+++ /dev/null -@@ -1,87 +0,0 @@ --diff a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java (rejected hunks) --@@ -365,7 +365,7 @@ public abstract class EntityLiving extends Entity { -- this.aK = this.aJ; -- this.lastYaw = this.yaw; -- this.lastPitch = this.pitch; --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- } -- -- public boolean cM() { --@@ -2497,10 +2497,10 @@ public abstract class EntityLiving extends Entity { -- } -- -- this.aR += (f3 - this.aR) * 0.3F; --- this.world.getMethodProfiler().enter("headTurn"); --+ //this.world.getMethodProfiler().enter("headTurn"); // Akarin - remove caller -- f2 = this.f(f1, f2); --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("rangeChecks"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("rangeChecks"); // Akarin - remove caller -- -- while (this.yaw - this.lastYaw < -180.0F) { -- this.lastYaw -= 360.0F; --@@ -2534,7 +2534,7 @@ public abstract class EntityLiving extends Entity { -- this.aK += 360.0F; -- } -- --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- this.aS += f2; -- if (this.isGliding()) { -- ++this.bl; --@@ -2733,19 +2733,19 @@ public abstract class EntityLiving extends Entity { -- } -- -- this.setMot(d4, d5, d6); --- this.world.getMethodProfiler().enter("ai"); --+ //this.world.getMethodProfiler().enter("ai"); // Akarin - remove caller -- if (this.isFrozen()) { -- this.jumping = false; -- this.aY = 0.0F; -- this.ba = 0.0F; -- } else if (this.doAITick()) { --- this.world.getMethodProfiler().enter("newAi"); --+ //this.world.getMethodProfiler().enter("newAi"); // Akarin - remove caller -- this.doTick(); --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- } -- --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("jump"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("jump"); // Akarin - remove caller -- if (this.jumping && this.cS()) { -- double d7; -- --@@ -2772,23 +2772,23 @@ public abstract class EntityLiving extends Entity { -- this.jumpTicks = 0; -- } -- --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("travel"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("travel"); // Akarin - remove caller -- this.aY *= 0.98F; -- this.ba *= 0.98F; -- this.t(); -- AxisAlignedBB axisalignedbb = this.getBoundingBox(); -- -- this.f(new Vec3D((double) this.aY, (double) this.aZ, (double) this.ba)); --- this.world.getMethodProfiler().exit(); --- this.world.getMethodProfiler().enter("push"); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller --+ //this.world.getMethodProfiler().enter("push"); // Akarin - remove caller -- if (this.bm > 0) { -- --this.bm; -- this.a(axisalignedbb, this.getBoundingBox()); -- } -- -- this.collideNearby(); --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- if (!this.world.isClientSide && this.dN() && this.aC()) { -- this.damageEntity(DamageSource.DROWN, 1.0F); -- } -diff --git a/src/main/java/net/minecraft/server/EntityPiglin.java b/src/main/java/net/minecraft/server/EntityPiglin.java -index ca7f9dc54ed2e58f521613b5d8027494bd20edd2..b54ead67c3b7634fb252436b6902b9a4322a7966 100644 ---- a/src/main/java/net/minecraft/server/EntityPiglin.java -+++ b/src/main/java/net/minecraft/server/EntityPiglin.java -@@ -143,7 +143,7 @@ public class EntityPiglin extends EntityPiglinAbstract implements ICrossbow { - - @Override - public BehaviorController getBehaviorController() { -- return super.getBehaviorController(); -+ return (BehaviorController) super.getBehaviorController(); // Yatopia - decompile fix - } - - @Override -@@ -201,9 +201,9 @@ public class EntityPiglin extends EntityPiglinAbstract implements ICrossbow { - - @Override - protected void mobTick() { -- this.world.getMethodProfiler().enter("piglinBrain"); -- this.getBehaviorController().a((WorldServer) this.world, (EntityLiving) this); -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().enter("piglinBrain"); // Akarin - remove caller -+ this.getBehaviorController().a((WorldServer) this.world, this); // Yatopia - decompile fix -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - PiglinAI.b(this); - super.mobTick(); - } -@@ -341,7 +341,7 @@ public class EntityPiglin extends EntityPiglinAbstract implements ICrossbow { - - @Override - protected SoundEffect getSoundAmbient() { -- return this.world.isClientSide ? null : (SoundEffect) PiglinAI.d(this).orElse((Object) null); -+ return this.world.isClientSide ? null : (SoundEffect) PiglinAI.d(this).orElse(null); // Yatopia - decompile fix - } - - @Override -diff --git a/src/main/java/net/minecraft/server/EntityPiglin.java.rej b/src/main/java/net/minecraft/server/EntityPiglin.java.rej -deleted file mode 100644 -index 9f3608357280a269c655b00feed22ebc29922d52..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/EntityPiglin.java.rej -+++ /dev/null -@@ -1,13 +0,0 @@ --diff a/src/main/java/net/minecraft/server/EntityPiglin.java b/src/main/java/net/minecraft/server/EntityPiglin.java (rejected hunks) --@@ -235,9 +235,9 @@ public class EntityPiglin extends EntityMonster implements ICrossbow { -- -- @Override -- protected void mobTick() { --- this.world.getMethodProfiler().enter("piglinBrain"); --+ //this.world.getMethodProfiler().enter("piglinBrain"); // Akarin - remove caller -- this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error --- this.world.getMethodProfiler().exit(); --+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller -- PiglinAI.b(this); -- if (this.eO()) { -- ++this.bA; -diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 976c44c8eeecc513fa11de55b80317550f621407..5bb47279fdeeeef04f35115c916d24ddb8a098bb 100644 ---- a/src/main/java/net/minecraft/server/EntityPlayer.java -+++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -920,7 +920,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { - ShapeDetectorShape shapedetectorshape = this.a(worldserver); - - if (shapedetectorshape != null) { -- worldserver1.getMethodProfiler().enter("moving"); -+ //worldserver1.getMethodProfiler().enter("moving"); // Akarin - remove caller - worldserver = shapedetectorshape.world; // CraftBukkit - if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event - if (resourcekey == DimensionManager.OVERWORLD && worldserver.getTypeKey() == DimensionManager.THE_NETHER) { // CraftBukkit -@@ -943,8 +943,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { - worldserver = ((CraftWorld) exit.getWorld()).getHandle(); - // CraftBukkit end - -- worldserver1.getMethodProfiler().exit(); -- worldserver1.getMethodProfiler().enter("placing"); -+ //worldserver1.getMethodProfiler().exit(); // Akarin - remove caller -+ //worldserver1.getMethodProfiler().enter("placing"); // Akarin - remove caller - if (true) { // CraftBukkit - this.worldChangeInvuln = true; // CraftBukkit - Set teleport invulnerability only if player changing worlds - -@@ -961,7 +961,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { - worldserver.addPlayerPortal(this); - this.playerConnection.teleport(exit); // CraftBukkit - use internal teleport without event - this.playerConnection.syncPosition(); // CraftBukkit - sync position after changing it (from PortalTravelAgent#findAndteleport) -- worldserver1.getMethodProfiler().exit(); -+ //worldserver1.getMethodProfiler().exit(); // Akarin - remove caller - this.triggerDimensionAdvancements(worldserver1); - this.playerInteractManager.a(worldserver); - this.playerConnection.sendPacket(new PacketPlayOutAbilities(this.abilities)); -diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java.rej b/src/main/java/net/minecraft/server/EntityPlayer.java.rej -deleted file mode 100644 -index f5c0ccfcbfeda191e3a077bb4313a8c8b8b4178d..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/EntityPlayer.java.rej -+++ /dev/null -@@ -1,30 +0,0 @@ --diff a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java (rejected hunks) --@@ -900,7 +900,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { -- float f1 = this.yaw; -- float f2 = f1; -- --- worldserver1.getMethodProfiler().enter("moving"); --+ //worldserver1.getMethodProfiler().enter("moving"); // Akarin - remove caller -- double d3; -- -- if (worldserver == null) { } else // CraftBukkit - empty to fall through to null to event --@@ -951,8 +951,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { -- // CraftBukkit end -- -- // this.setPositionRotation(d0, d1, d2, f1, f); // CraftBukkit - PlayerTeleportEvent handles position changes --- worldserver1.getMethodProfiler().exit(); --- worldserver1.getMethodProfiler().enter("placing"); --+ //worldserver1.getMethodProfiler().exit(); // Akarin - remove caller --+ //worldserver1.getMethodProfiler().enter("placing"); // Akarin - remove caller -- // Spigot start - SPIGOT-5677, MC-114796: Fix portals generating outside world border -- double d4 = Math.max(-2.9999872E7D, worldserver.getWorldBorder().e() + 16.0D); -- --@@ -1001,7 +1001,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { -- // CraftBukkit end -- } -- --- worldserver1.getMethodProfiler().exit(); --+ //worldserver1.getMethodProfiler().exit(); // Akarin - remove caller -- // CraftBukkit start - PlayerTeleportEvent -- PlayerTeleportEvent tpEvent = new PlayerTeleportEvent(this.getBukkitEntity(), enter, exit, cause); -- Bukkit.getServer().getPluginManager().callEvent(tpEvent); -diff --git a/src/main/java/net/minecraft/server/EntitySlice.java b/src/main/java/net/minecraft/server/EntitySlice.java -index 1250c3cbe915815939627701c153ba6254fc05f0..ac7b5bc179a3e174ae09b3444b3ba89b5627a174 100644 ---- a/src/main/java/net/minecraft/server/EntitySlice.java -+++ b/src/main/java/net/minecraft/server/EntitySlice.java -@@ -65,7 +65,7 @@ public class EntitySlice extends AbstractCollection { - if (!this.b.isAssignableFrom(oclass)) { - throw new IllegalArgumentException("Don't know how to search for " + oclass); - } else { -- List list = (List) this.a.computeIfAbsent(oclass, (oclass1) -> { -+ List list = (List) this.a.computeIfAbsent(oclass, (oclass1) -> { // Yatopia - decompile fix - why is this still being here? - Stream stream = this.c.stream(); - - oclass1.getClass(); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index a02f54ab3ac721a5697f8efea474d2999a0fd7bd..9dc054e2e189f8c65a9d12f70e180e7ded79a997 100644 +index a02f54ab3ac721a5697f8efea474d2999a0fd7bd..2faaf483cca26586226a2e08ac01285a62a68f6f 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -92,6 +92,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -1075,22 +277,6 @@ index a02f54ab3ac721a5697f8efea474d2999a0fd7bd..9dc054e2e189f8c65a9d12f70e180e7d public void c(WorldServer worldserver) { BehaviorController behaviorcontroller = this.getBehaviorController(); -@@ -167,13 +174,13 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation - @Override - protected void mobTick() { mobTick(false); } - protected void mobTick(boolean inactive) { -- this.world.getMethodProfiler().enter("villagerBrain"); -+ //this.world.getMethodProfiler().enter("villagerBrain"); // Akarin - remove caller - // Purpur start - boolean tick = (world.getTime() + brainTickOffset) % world.purpurConfig.villagerBrainTicks == 0; - if (((WorldServer) world).getMinecraftServer().lagging ? tick : world.purpurConfig.villagerUseBrainTicksOnlyWhenLagging || tick) - // Purpur end - if (!inactive) this.getBehaviorController().a((WorldServer) this.world, this); // CraftBukkit - decompile error // Paper -- this.world.getMethodProfiler().exit(); -+ //this.world.getMethodProfiler().exit(); // Akarin - remove caller - if (this.bF) { - this.bF = false; - } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java.rej b/src/main/java/net/minecraft/server/EntityVillager.java.rej deleted file mode 100644 index 538b2c92e050176a1ac0bb4c2315f5b22c7f8eac..0000000000000000000000000000000000000000 @@ -1110,35 +296,6 @@ index 538b2c92e050176a1ac0bb4c2315f5b22c7f8eac..00000000000000000000000000000000 - // Purpur end - - @Override -diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 41aa0d32c9e7f9c67ebd2e724304253b8fc8a09b..648a7d48162b2a2712382ed7055ccaf97c200daf 100644 ---- a/src/main/java/net/minecraft/server/Explosion.java -+++ b/src/main/java/net/minecraft/server/Explosion.java -@@ -291,7 +291,7 @@ public class Explosion { - if (!iblockdata.isAir() && iblockdata.isDestroyable()) { // Paper - BlockPosition blockposition1 = blockposition.immutableCopy(); - -- this.world.getMethodProfiler().enter("explosion_blocks"); -+ //this.world.getMethodProfiler().enter("explosion_blocks"); // Akarin - remove caller - if (block.a(this) && this.world instanceof WorldServer) { - TileEntity tileentity = block.isTileEntity() ? this.world.getTileEntity(blockposition) : null; - LootTableInfo.Builder loottableinfo_builder = (new LootTableInfo.Builder((WorldServer) this.world)).a(this.world.random).set(LootContextParameters.ORIGIN, Vec3D.a((BaseBlockPosition) blockposition)).set(LootContextParameters.TOOL, ItemStack.b).setOptional(LootContextParameters.BLOCK_ENTITY, tileentity).setOptional(LootContextParameters.THIS_ENTITY, this.source); -diff --git a/src/main/java/net/minecraft/server/Explosion.java.rej b/src/main/java/net/minecraft/server/Explosion.java.rej -deleted file mode 100644 -index 98a910fa6bfc9542b1d1cb56b6621809acd6b279..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/Explosion.java.rej -+++ /dev/null -@@ -1,10 +0,0 @@ --diff a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java (rejected hunks) --@@ -281,7 +281,7 @@ public class Explosion { -- if (!iblockdata.isAir() && iblockdata.isDestroyable()) { // Paper -- BlockPosition blockposition1 = blockposition.immutableCopy(); -- --- this.world.getMethodProfiler().enter("explosion_blocks"); --+ //this.world.getMethodProfiler().enter("explosion_blocks"); // Akarin - remove caller -- if (block.a(this) && this.world instanceof WorldServer) { -- TileEntity tileentity = block.isTileEntity() ? this.world.getTileEntity(blockposition) : null; -- LootTableInfo.Builder loottableinfo_builder = (new LootTableInfo.Builder((WorldServer) this.world)).a(this.world.random).set(LootContextParameters.POSITION, blockposition).set(LootContextParameters.TOOL, ItemStack.b).setOptional(LootContextParameters.BLOCK_ENTITY, tileentity).setOptional(LootContextParameters.THIS_ENTITY, this.source); diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java index 567c1bb19020a76b3ce03d8b79b8982d51238dde..b7dfa73d4119fe1195412e9ce60fe982ffc42c55 100644 --- a/src/main/java/net/minecraft/server/IProjectile.java @@ -1192,35 +349,6 @@ index 963c90c065a9e362c8c3030bb36ac6bf0c14a8e2..00000000000000000000000000000000 - } - - public boolean checkIfLeftOwner() { return this.h(); } // Purpur - OBFHELPER -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 21fec686282d2d2190e26e541d5b2b4d3d03c730..12922030c7ab0267018158d3fccb0eeedc370b7c 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1299,7 +1299,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0) { // Paper - this.playerList.savePlayers(playerSaveInterval); // Paper - }// Paper -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java.rej b/src/main/java/net/minecraft/server/MinecraftServer.java.rej -deleted file mode 100644 -index 2a6cb738059fb4bd0cc45f0db7aad25f7c46f9e5..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java.rej -+++ /dev/null -@@ -1,10 +0,0 @@ --diff a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java (rejected hunks) --@@ -1283,7 +1283,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit // Paper - move down -- //MinecraftServer.LOGGER.debug("Autosave started"); // Paper -- serverAutoSave = (autosavePeriod > 0 && this.ticks % autosavePeriod == 0); // Paper --- this.methodProfiler.enter("save"); --+ //this.methodProfiler.enter("save"); // Akarin - remove caller -- if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // Paper -- this.playerList.savePlayers(); -- }// Paper diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java index a62c87bceab2c9700a7b3925f208b0ffa2b9b393..1a6c593f5f20fb3a8e87ccb70cd3de7f0dcb0327 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java @@ -1257,7 +385,7 @@ index dd52a8fe4fd46e57a5d1af49ba1965a483cf4fcc..00000000000000000000000000000000 - IChunkAccess ichunkaccess = iworldreader.getChunkAt(chunkcoordintpair.x, chunkcoordintpair.z, ChunkStatus.STRUCTURE_STARTS, !(iworldreader instanceof World) || !((World) iworldreader).origamiConfig.onlyFindGeneratedFeatures); - if (ichunkaccess == null) { diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index cf43f47c27992b119e07d38a7a79ecc183e12844..50eedfe5a0fe897f1e3b748bcae5c1d0c53b1467 100644 +index 9c92f7e7f51c7438a6d4f74b26f4965cdff538b0..55f12f104515e73e7f282bfbd21cb372ad5c3832 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -96,6 +96,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -1276,18 +404,6 @@ index cf43f47c27992b119e07d38a7a79ecc183e12844..50eedfe5a0fe897f1e3b748bcae5c1d0 this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this, executor) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray this.generator = gen; this.world = new CraftWorld((WorldServer) this, gen, env); -@@ -449,9 +451,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { - IBlockData iblockdata2 = this.getType(blockposition); - - if ((i & 128) == 0 && iblockdata2 != iblockdata1 && (iblockdata2.b((IBlockAccess) this, blockposition) != iblockdata1.b((IBlockAccess) this, blockposition) || iblockdata2.f() != iblockdata1.f() || iblockdata2.e() || iblockdata1.e())) { -- this.getMethodProfiler().enter("queueCheckLight"); -+ //this.getMethodProfiler().enter("queueCheckLight"); // Akarin - remove caller - this.getChunkProvider().getLightEngine().a(blockposition); -- this.getMethodProfiler().exit(); -+ //this.getMethodProfiler().exit(); // Akarin - remove caller - } - - /* diff --git a/src/main/java/net/minecraft/server/World.java.rej b/src/main/java/net/minecraft/server/World.java.rej deleted file mode 100644 index 313aa8f7d47c53a6a0130994c9d61d7c073c95c6..0000000000000000000000000000000000000000 @@ -1313,10 +429,20 @@ index 313aa8f7d47c53a6a0130994c9d61d7c073c95c6..00000000000000000000000000000000 - this.generator = gen; - this.world = new CraftWorld((WorldServer) this, gen, env); diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 2efe5db22422b25d0237744fa384f8974a52fbc2..1f77b251d7e7b0f023793cbf0876fc067caa75c1 100644 +index b5cf60495b85c6ae6c32ee8a1c65d80e59fdce3d..1f77b251d7e7b0f023793cbf0876fc067caa75c1 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java -@@ -61,7 +61,7 @@ public class WorldNBTStorage { +@@ -49,7 +49,8 @@ public class WorldNBTStorage { + File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat"); + // Spigot Start + boolean usingWrongFile = false; +- if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first ++ boolean normalFile = file.exists() && file.isFile(); // Akarin - ensures normal file ++ if ( org.bukkit.Bukkit.getOnlineMode() && !normalFile ) // Paper - Check online mode first // Akarin - ensures normal file + { + file = new File( this.playerDir, java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); + if ( file.exists() ) +@@ -60,7 +61,7 @@ public class WorldNBTStorage { } // Spigot End @@ -1327,12 +453,22 @@ index 2efe5db22422b25d0237744fa384f8974a52fbc2..1f77b251d7e7b0f023793cbf0876fc06 // Spigot Start diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java.rej b/src/main/java/net/minecraft/server/WorldNBTStorage.java.rej deleted file mode 100644 -index 3a35169eaf680c45fe42922eb5f0014fa422c31c..0000000000000000000000000000000000000000 +index 39dce006ebf2bd81a9d6c62c25eb9bd55d24199e..0000000000000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java.rej +++ /dev/null -@@ -1,10 +0,0 @@ +@@ -1,20 +0,0 @@ -diff a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java (rejected hunks) --@@ -62,7 +63,7 @@ public class WorldNBTStorage { +-@@ -165,7 +165,8 @@ public class WorldNBTStorage implements IPlayerFileData { +- File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat"); +- // Spigot Start +- boolean usingWrongFile = false; +-- if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first +-+ boolean normalFile = file.exists() && file.isFile(); // Akarin - ensures normal file +-+ if ( org.bukkit.Bukkit.getOnlineMode() && !normalFile ) // Paper - Check online mode first // Akarin - ensures normal file +- { +- file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); +- if ( file.exists() ) +-@@ -176,7 +177,7 @@ public class WorldNBTStorage implements IPlayerFileData { - } - // Spigot End - @@ -1341,206 +477,6 @@ index 3a35169eaf680c45fe42922eb5f0014fa422c31c..00000000000000000000000000000000 - nbttagcompound = NBTCompressedStreamTools.a((InputStream) (new FileInputStream(file))); - } - // Spigot Start -diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index ca835dc52ddfd117abb45a85277939eb6a036075..ef25ea47159cc58659756fb4b2e223e556065b00 100644 ---- a/src/main/java/net/minecraft/server/WorldServer.java -+++ b/src/main/java/net/minecraft/server/WorldServer.java -@@ -872,9 +872,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { - // Tuinity end - optimise checkDespawn - - this.ticking = true; -- gameprofilerfiller.enter("world border"); -+ //gameprofilerfiller.enter("world border"); // Akarin - remove caller - this.getWorldBorder().s(); -- gameprofilerfiller.exitEnter("weather"); -+ //gameprofilerfiller.exitEnter("weather"); // Akarin - remove caller - boolean flag = this.isRaining(); - - if (this.getDimensionManager().hasSkyLight()) { -@@ -1007,11 +1007,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { - - this.Q(); - this.b(); -- gameprofilerfiller.exitEnter("chunkSource"); -+ //gameprofilerfiller.exitEnter("chunkSource"); // Akarin - remove caller - this.timings.chunkProviderTick.startTiming(); // Paper - timings - this.getChunkProvider().tick(booleansupplier); - this.timings.chunkProviderTick.stopTiming(); // Paper - timings -- gameprofilerfiller.exitEnter("tickPending"); -+ //gameprofilerfiller.exitEnter("tickPending"); // Akarin - remove caller - timings.scheduledBlocks.startTiming(); // Paper - if (!this.isDebugWorld()) { - this.nextTickListBlock.b(); -@@ -1020,17 +1020,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { - timings.scheduledBlocks.stopTiming(); // Paper - - // Tuinity - replace logic -- gameprofilerfiller.exitEnter("raid"); -+ //gameprofilerfiller.exitEnter("raid"); // Akarin - remove caller - this.timings.raids.startTiming(); // Paper - timings - this.persistentRaid.a(); - this.timings.raids.stopTiming(); // Paper - timings -- gameprofilerfiller.exitEnter("blockEvents"); -+ //gameprofilerfiller.exitEnter("blockEvents"); // Akarin - remove caller - timings.doSounds.startTiming(); // Spigot - this.ak(); - timings.doSounds.stopTiming(); // Spigot - // Tuinity - replace logic - this.ticking = false; -- gameprofilerfiller.exitEnter("entities"); -+ //gameprofilerfiller.exitEnter("entities"); // Akarin - remove caller - boolean flag3 = true || !this.players.isEmpty() || !this.getForceLoadedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players - - if (flag3) { -@@ -1170,7 +1170,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { - int k = chunkcoordintpair.e(); - GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); - -- gameprofilerfiller.enter("thunder"); -+ //gameprofilerfiller.enter("thunder"); // Akarin - remove caller - final BlockPosition.MutableBlockPosition blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change - - if (!this.paperConfig.disableThunder && flag && this.W() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder -@@ -1410,13 +1410,13 @@ public class WorldServer extends World implements GeneratorAccessSeed { - gameprofilerfiller.a(() -> { - return IRegistry.ENTITY_TYPE.getKey(entity.getEntityType()).toString(); - }); -- gameprofilerfiller.c("tickNonPassenger"); -+ //gameprofilerfiller.c("tickNonPassenger"); // Akarin - remove caller - if (isActive) { // Paper - EAR 2 - TimingHistory.activatedEntityTicks++; // Paper - entity.tick(); - entity.postTick(); // CraftBukkit - } else { entity.inactiveTick(); } // Paper - EAR 2 -- gameprofilerfiller.exit(); -+ //gameprofilerfiller.exit(); // Akarin - remove caller - } - - this.chunkCheck(entity); -@@ -1458,7 +1458,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { - gameprofilerfiller.a(() -> { - return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); - }); -- gameprofilerfiller.c("tickPassenger"); -+ //gameprofilerfiller.c("tickPassenger"); // Akarin - remove caller - // Paper start - EAR 2 - if (isActive) { - entity1.passengerTick(); -@@ -1470,7 +1470,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { - entity.syncPositionOf(entity1); - } - // Paper end - EAR 2 -- gameprofilerfiller.exit(); -+ //gameprofilerfiller.exit(); // Akarin - remove caller - } - - this.chunkCheck(entity1); -@@ -1492,7 +1492,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { - - public void chunkCheck(Entity entity) { - if (entity.cl()) { -- this.getMethodProfiler().enter("chunkCheck"); -+ //this.getMethodProfiler().enter("chunkCheck"); // Akarin - remove caller - int i = MathHelper.floor(entity.locX() / 16.0D); - int j = Math.min(15, Math.max(0, MathHelper.floor(entity.locY() / 16.0D))); // Paper - stay consistent with chunk add/remove behavior - int k = MathHelper.floor(entity.locZ() / 16.0D); -diff --git a/src/main/java/net/minecraft/server/WorldServer.java.rej b/src/main/java/net/minecraft/server/WorldServer.java.rej -deleted file mode 100644 -index 8aa3dd3a0a0db575292be8d9c73bb3083849622b..0000000000000000000000000000000000000000 ---- a/src/main/java/net/minecraft/server/WorldServer.java.rej -+++ /dev/null -@@ -1,91 +0,0 @@ --diff a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java (rejected hunks) --@@ -752,9 +752,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { -- GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); -- -- this.ticking = true; --- gameprofilerfiller.enter("world border"); --+ //gameprofilerfiller.enter("world border"); // Akarin - remove caller -- this.getWorldBorder().s(); --- gameprofilerfiller.exitEnter("weather"); --+ //gameprofilerfiller.exitEnter("weather"); // Akarin - remove caller -- boolean flag = this.isRaining(); -- -- if (this.getDimensionManager().hasSkyLight()) { --@@ -887,11 +887,11 @@ public class WorldServer extends World implements GeneratorAccessSeed { -- -- this.N(); -- this.b(); --- gameprofilerfiller.exitEnter("chunkSource"); --+ //gameprofilerfiller.exitEnter("chunkSource"); // Akarin - remove caller -- this.timings.chunkProviderTick.startTiming(); // Paper - timings -- this.getChunkProvider().tick(booleansupplier); -- this.timings.chunkProviderTick.stopTiming(); // Paper - timings --- gameprofilerfiller.exitEnter("tickPending"); --+ //gameprofilerfiller.exitEnter("tickPending"); // Akarin - remove caller -- timings.scheduledBlocks.startTiming(); // Paper -- if (!this.isDebugWorld()) { -- this.nextTickListBlock.b(); --@@ -900,17 +900,17 @@ public class WorldServer extends World implements GeneratorAccessSeed { -- timings.scheduledBlocks.stopTiming(); // Paper -- -- // Tuinity - replace logic --- gameprofilerfiller.exitEnter("raid"); --+ //gameprofilerfiller.exitEnter("raid"); // Akarin - remove caller -- this.timings.raids.startTiming(); // Paper - timings -- this.persistentRaid.a(); -- this.timings.raids.stopTiming(); // Paper - timings --- gameprofilerfiller.exitEnter("blockEvents"); --+ //gameprofilerfiller.exitEnter("blockEvents"); // Akarin - remove caller -- timings.doSounds.startTiming(); // Spigot -- this.ah(); -- timings.doSounds.stopTiming(); // Spigot -- // Tuinity - replace logic -- this.ticking = false; --- gameprofilerfiller.exitEnter("entities"); --+ //gameprofilerfiller.exitEnter("entities"); // Akarin - remove caller -- boolean flag3 = true || !this.players.isEmpty() || !this.getForceLoadedChunks().isEmpty(); // CraftBukkit - this prevents entity cleanup, other issues on servers with no players -- -- if (flag3) { --@@ -1049,7 +1049,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { -- int k = chunkcoordintpair.e(); -- GameProfilerFiller gameprofilerfiller = this.getMethodProfiler(); -- --- gameprofilerfiller.enter("thunder"); --+ //gameprofilerfiller.enter("thunder"); // Akarin - remove caller -- final BlockPosition.MutableBlockPosition blockposition = this.chunkTickMutablePosition; // Paper - use mutable to reduce allocation rate, final to force compile fail on change -- -- if (!this.paperConfig.disableThunder && flag && this.T() && this.random.nextInt(100000) == 0) { // Paper - Disable thunder --@@ -1284,10 +1284,10 @@ public class WorldServer extends World implements GeneratorAccessSeed { -- gameprofilerfiller.a(() -> { -- return IRegistry.ENTITY_TYPE.getKey(entity.getEntityType()).toString(); -- }); --- gameprofilerfiller.c("tickNonPassenger"); --+ //gameprofilerfiller.c("tickNonPassenger"); // Akarin - remove caller -- entity.tick(); -- entity.postTick(); // CraftBukkit --- gameprofilerfiller.exit(); --+ //gameprofilerfiller.exit(); // Akarin - remove caller -- } -- -- this.chunkCheck(entity); --@@ -1325,9 +1325,9 @@ public class WorldServer extends World implements GeneratorAccessSeed { -- gameprofilerfiller.a(() -> { -- return IRegistry.ENTITY_TYPE.getKey(entity1.getEntityType()).toString(); -- }); --- gameprofilerfiller.c("tickPassenger"); --+ //gameprofilerfiller.c("tickPassenger"); // Akarin - remove caller -- entity1.passengerTick(); --- gameprofilerfiller.exit(); --+ //gameprofilerfiller.exit(); // Akarin - remove caller -- } -- -- this.chunkCheck(entity1); --@@ -1349,7 +1349,7 @@ public class WorldServer extends World implements GeneratorAccessSeed { -- -- public void chunkCheck(Entity entity) { -- if (entity.ck()) { --- this.getMethodProfiler().enter("chunkCheck"); --+ //this.getMethodProfiler().enter("chunkCheck"); // Akarin - remove caller -- int i = MathHelper.floor(entity.locX() / 16.0D); -- int j = Math.min(15, Math.max(0, MathHelper.floor(entity.locY() / 16.0D))); // Paper - stay consistent with chunk add/remove behavior -- int k = MathHelper.floor(entity.locZ() / 16.0D); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java index 31f918778317f05bd5b09f4a8ee55bb4b71defd1..689a1541853e03e8e6d7a30bc5937978124aba2c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java diff --git a/patches/server/0003-Brandings.patch b/patches/server/0003-Brandings.patch index 937ce306..bf361eb4 100644 --- a/patches/server/0003-Brandings.patch +++ b/patches/server/0003-Brandings.patch @@ -39,7 +39,7 @@ index 74ed02fa9296583977bb721014b10ff8b708b43c..a13c7b2b5bc79ecaea404779149ed02c .completer(new ConsoleCommandCompleter(this.server)) ); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 12922030c7ab0267018158d3fccb0eeedc370b7c..c6ad1dd8cabdad0b8ca54eecb82f45703b3eb1f2 100644 +index 2d61504e69b6d2ee18c3b71bb032e5ab13417138..4f0ab969ec222c78b85791653c81fa4e92985172 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1524,7 +1524,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c6ad1dd8cabdad0b8ca54eecb82f45703b3eb1f2..22792d8097351c5d1c2e085a20429b28f7f90b6e 100644 +index 4f0ab969ec222c78b85791653c81fa4e92985172..18cf697da5665c45e7ea84c85513a615379474c4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -937,6 +937,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant