core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove timings addition that was fixed upstream

This commit is contained in:
Zach Brown 2016-06-15 17:51:30 -05:00
parent cd6dadb8bc
commit cabb2450ed
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
4 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0161-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch → Spigot-Server-Patches/0160-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
View File

@ -1,4 +1,4 @@
From 9adcc89bfa5cf4efea4dbf29280ace24cd00cb83 Mon Sep 17 00:00:00 2001 From 1b41093540b70cdc5a56b9c949d46b5ec62633fd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 31 May 2016 22:53:50 -0400 Date: Tue, 31 May 2016 22:53:50 -0400
Subject: [PATCH] Only send Dragon/Wither Death sounds to same world 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 deltaZ = this.locZ - player.locZ;
double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
-- --
2.8.3 2.8.3.windows.1

21
Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch
View File

@ -1,21 +0,0 @@
From cb654874d86e9cd0215054ea3014255a7d37907c Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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

4
Spigot-Server-Patches/0162-Fix-FallingBlocks-being-stuck-on-fences.patch → Spigot-Server-Patches/0161-Fix-FallingBlocks-being-stuck-on-fences.patch
View File

@ -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 <postremus1996@googlemail.com> From: Martin Panzer <postremus1996@googlemail.com>
Date: Fri, 3 Jun 2016 23:13:39 +0200 Date: Fri, 3 Jun 2016 23:13:39 +0200
Subject: [PATCH] Fix FallingBlocks being stuck on fences Subject: [PATCH] Fix FallingBlocks being stuck on fences
@ -85,5 +85,5 @@ index 491bb11..0d8c438 100644
Block block = this.block.getBlock(); Block block = this.block.getBlock();
-- --
2.8.3 2.8.3.windows.1

4
Spigot-Server-Patches/0163-MC-80966-Always-send-chunk-sections.patch → Spigot-Server-Patches/0162-MC-80966-Always-send-chunk-sections.patch
View File

@ -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 <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 11 Jun 2016 14:59:15 -0500 Date: Sat, 11 Jun 2016 14:59:15 -0500
Subject: [PATCH] MC-80966 - Always send chunk sections Subject: [PATCH] MC-80966 - Always send chunk sections
@ -20,5 +20,5 @@ index fc5c895..b2e81f0 100644
public boolean shouldTick() { public boolean shouldTick() {
-- --
2.8.3 2.8.3.windows.1