From e4b436a05d980f70e78dde0f7c3f24e87dc893b8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 17:26:54 -0400 Subject: [PATCH] [CI-SKIP] Remove paper tags - Fixes #1192 --- ...okups-for-Entity-TileEntity-Current-Ch.patch | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Spigot-Server-Patches/0326-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch b/Spigot-Server-Patches/0326-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch index 78d1380e7f..25ccf7ef3c 100644 --- a/Spigot-Server-Patches/0326-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch +++ b/Spigot-Server-Patches/0326-Avoid-Chunk-Lookups-for-Entity-TileEntity-Current-Ch.patch @@ -1,4 +1,4 @@ -From 4cf1cb342584e61ede86313ca6134a164bb14aad Mon Sep 17 00:00:00 2001 +From a5bc569a599ad30157f4bc07759e08ad1d963512 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 03:39:51 -0400 Subject: [PATCH] Avoid Chunk Lookups for Entity/TileEntity Current Chunk @@ -22,7 +22,7 @@ index 71d0db3f3..a51b648c5 100644 this.a(entity, entity.ac); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c0816b9f8..bd15f0588 100644 +index c0816b9f8..623290caa 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1511,12 +1511,15 @@ public abstract class World implements IBlockAccess { @@ -83,18 +83,7 @@ index c0816b9f8..bd15f0588 100644 this.getChunkAtWorldCoords(tileentity.getPosition()).d(tileentity.getPosition()); } } -@@ -1684,8 +1695,10 @@ public abstract class World implements IBlockAccess { - } - // CraftBukkit end */ - -+ // Paper - if (this.isLoaded(tileentity1.getPosition())) { - Chunk chunk = this.getChunkAtWorldCoords(tileentity1.getPosition()); -+ // Paper end - IBlockData iblockdata = chunk.getBlockData(tileentity1.getPosition()); - - chunk.a(tileentity1.getPosition(), tileentity1); -@@ -1805,8 +1818,11 @@ public abstract class World implements IBlockAccess { +@@ -1805,8 +1816,11 @@ public abstract class World implements IBlockAccess { int k = MathHelper.floor(entity.locZ / 16.0D); if (!entity.aa || entity.ab != i || entity.ac != j || entity.ad != k) {