From cabb2450edb5e01b820e08f070d00157e8b12262 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 15 Jun 2016 17:51:30 -0500 Subject: [PATCH] Remove timings addition that was fixed upstream --- ...n-Wither-Death-sounds-to-same-world.patch} | 4 ++-- ...ntityTick.startTiming-Spigot-removed.patch | 21 ------------------- ...FallingBlocks-being-stuck-on-fences.patch} | 4 ++-- ...MC-80966-Always-send-chunk-sections.patch} | 4 ++-- 4 files changed, 6 insertions(+), 27 deletions(-) rename Spigot-Server-Patches/{0161-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch => 0160-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch} (97%) delete mode 100644 Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch rename Spigot-Server-Patches/{0162-Fix-FallingBlocks-being-stuck-on-fences.patch => 0161-Fix-FallingBlocks-being-stuck-on-fences.patch} (97%) rename Spigot-Server-Patches/{0163-MC-80966-Always-send-chunk-sections.patch => 0162-MC-80966-Always-send-chunk-sections.patch} (90%) diff --git a/Spigot-Server-Patches/0161-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0160-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch similarity index 97% rename from Spigot-Server-Patches/0161-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch rename to Spigot-Server-Patches/0160-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 01fa8eeec..de8d44149 100644 --- a/Spigot-Server-Patches/0161-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0160-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From 9adcc89bfa5cf4efea4dbf29280ace24cd00cb83 Mon Sep 17 00:00:00 2001 +From 1b41093540b70cdc5a56b9c949d46b5ec62633fd Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -44,5 +44,5 @@ index c7031fc..1556a24 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- -2.8.3 +2.8.3.windows.1 diff --git a/Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch b/Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch deleted file mode 100644 index f96bbdebf..000000000 --- a/Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch +++ /dev/null @@ -1,21 +0,0 @@ -From cb654874d86e9cd0215054ea3014255a7d37907c Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Fri, 27 May 2016 22:06:35 -0400 -Subject: [PATCH] Re-add tileEntityTick.startTiming Spigot removed - - -diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 38a3692..3d80107 100644 ---- a/src/main/java/net/minecraft/server/World.java -+++ b/src/main/java/net/minecraft/server/World.java -@@ -1554,6 +1554,7 @@ public abstract class World implements IBlockAccess { - - timings.entityTick.stopTiming(); // Spigot - this.methodProfiler.c("blockEntities"); -+ timings.tileEntityTick.startTiming(); // Paper - Missed Timing start from Spigot - this.M = true; - timings.tileEntityTick.startTiming(); // Spigot - // CraftBukkit start - From below, clean up tile entities before ticking them --- -2.8.3.windows.1 - diff --git a/Spigot-Server-Patches/0162-Fix-FallingBlocks-being-stuck-on-fences.patch b/Spigot-Server-Patches/0161-Fix-FallingBlocks-being-stuck-on-fences.patch similarity index 97% rename from Spigot-Server-Patches/0162-Fix-FallingBlocks-being-stuck-on-fences.patch rename to Spigot-Server-Patches/0161-Fix-FallingBlocks-being-stuck-on-fences.patch index 7b7642e87..088faa417 100644 --- a/Spigot-Server-Patches/0162-Fix-FallingBlocks-being-stuck-on-fences.patch +++ b/Spigot-Server-Patches/0161-Fix-FallingBlocks-being-stuck-on-fences.patch @@ -1,4 +1,4 @@ -From 3d720d62112f2489ff4026922f27b1597a4fbf7f Mon Sep 17 00:00:00 2001 +From d10cccde3f3205d13b4024734a18bcd38a8f90d6 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Fri, 3 Jun 2016 23:13:39 +0200 Subject: [PATCH] Fix FallingBlocks being stuck on fences @@ -85,5 +85,5 @@ index 491bb11..0d8c438 100644 Block block = this.block.getBlock(); -- -2.8.3 +2.8.3.windows.1 diff --git a/Spigot-Server-Patches/0163-MC-80966-Always-send-chunk-sections.patch b/Spigot-Server-Patches/0162-MC-80966-Always-send-chunk-sections.patch similarity index 90% rename from Spigot-Server-Patches/0163-MC-80966-Always-send-chunk-sections.patch rename to Spigot-Server-Patches/0162-MC-80966-Always-send-chunk-sections.patch index abf0e02bc..dc0125d26 100644 --- a/Spigot-Server-Patches/0163-MC-80966-Always-send-chunk-sections.patch +++ b/Spigot-Server-Patches/0162-MC-80966-Always-send-chunk-sections.patch @@ -1,4 +1,4 @@ -From bd498ac48498c0555fdb0eb25c6bb1498481ce58 Mon Sep 17 00:00:00 2001 +From 7df8809967eac31f51ea02f50066971479c04742 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 11 Jun 2016 14:59:15 -0500 Subject: [PATCH] MC-80966 - Always send chunk sections @@ -20,5 +20,5 @@ index fc5c895..b2e81f0 100644 public boolean shouldTick() { -- -2.8.3 +2.8.3.windows.1