Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
5ce1dd48 Add hand to BlockMultiPlaceEvent (fixes #2997) (#2998)
3ad47bcf Reduce chunk range timers
793bae0d Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-03-02 19:26:45 -06:00
parent c283ffe6bd
commit 329e588e58
3 changed files with 6 additions and 6 deletions

2
Paper

Submodule Paper updated: 4df3dad85d...5ce1dd48e1

View File

@@ -1 +1 @@
1.15.2--0f0446d7fa69d9a7b7a7bcd0903c386249009e6e
1.15.2--f1111981a0c8d2a0c43ba485a8cbee39aeba2657

View File

@@ -1,4 +1,4 @@
From 235e99cdb51be4e62e987dd223824f900f3495d7 Mon Sep 17 00:00:00 2001
From 349a2932baf2172b796df1b0956629a11286c9b8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 1 Mar 2020 20:07:54 -0600
Subject: [PATCH] Optimize PlayerChunkMap
@@ -54,7 +54,7 @@ index 73d1570765..78735ba56e 100644
this.b(Integer.MAX_VALUE);
}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 0ea0d1cff8..1bc961a61d 100644
index 76c7f4a50f..dff40c04cd 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -648,19 +648,17 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -81,8 +81,8 @@ index 0ea0d1cff8..1bc961a61d 100644
this.world.getMethodProfiler().enter("broadcast");
this.world.timings.broadcastChunkUpdates.startTiming(); // Paper - timings
@@ -686,12 +684,7 @@ public class ChunkProviderServer extends IChunkProvider {
// Paper end
@@ -676,12 +674,7 @@ public class ChunkProviderServer extends IChunkProvider {
if (flag1 && (this.allowMonsters || this.allowAnimals) && this.world.getWorldBorder().isInBounds(chunk.getPos()) && !this.playerChunkMap.isOutsideOfRange(chunkcoordintpair, true)) { // Spigot
this.world.getMethodProfiler().enter("spawner");
this.world.timings.mobSpawn.startTiming(); // Spigot
- EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype;