Upstream Update (#5211)

2021-02-21 21:55:01 +01:00
parent 8bafdd49dc
commit db0dd75a20
21 changed files with 43 additions and 91 deletions
--- a/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch
+++ b/Spigot-Server-Patches/Prevent-tile-entity-and-entity-crashes.patch
@@ -42,9 +42,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                        this.tileEntityListTick.remove(tileTickPosition--);
 +                        continue;
 +                        // Paper end
-                     }
-                     // Spigot start
-                     finally {
+                         // Spigot start
+                     } finally {
+                         tileentity.tickTimer.stopTiming();
@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
         try {
             consumer.accept(entity);