Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
088fa6f28 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)
bd7c1d88b Merchant#getRecipes should return an immutable list (#5183)
This commit is contained in:
BillyGalbreath
2021-02-13 11:42:45 -06:00
parent 006e47f147
commit 9ae031c6f0
15 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/server/0001-Tuinity-Server-Changes.patch
View File

@@ -8598,7 +8598,7 @@ index 2d887af902a33b0e28d8f0a6ac2e59c815a7856e..2291135eaef64c403183724cb6e413cd
@Override
public BlockPosition immutableCopy() {
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index af9d54ef057d5f6977cf77c57cde25b6b0d1f39d..ae07ea2a34f5cd82ce2eae523359cb7540065335 100644
index 3bcd63a754538ccfc5965207a8fc79faa31925c0..68d6fb69a0c1b98b3c11b6d80783faaa58272526 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -91,6 +91,197 @@ public class Chunk implements IChunkAccess {
@@ -8812,15 +8812,7 @@ index af9d54ef057d5f6977cf77c57cde25b6b0d1f39d..ae07ea2a34f5cd82ce2eae523359cb75
Iterator iterator = protochunk.y().iterator();
while (iterator.hasNext()) {
@@ -548,6 +745,7 @@ public class Chunk implements IChunkAccess {
@Override
public void a(Entity entity) {
+ org.spigotmc.AsyncCatcher.catchOp("Chunk add entity"); // Tuinity
this.q = true;
int i = MathHelper.floor(entity.locX() / 16.0D);
int j = MathHelper.floor(entity.locZ() / 16.0D);
@@ -593,8 +791,8 @@ public class Chunk implements IChunkAccess {
@@ -594,8 +791,8 @@ public class Chunk implements IChunkAccess {
entity.chunkX = this.loc.x;
entity.chunkY = k;
entity.chunkZ = this.loc.z;
@@ -8831,15 +8823,7 @@ index af9d54ef057d5f6977cf77c57cde25b6b0d1f39d..ae07ea2a34f5cd82ce2eae523359cb75
// Paper start
if (entity instanceof EntityItem) {
itemCounts[k]++;
@@ -617,6 +815,7 @@ public class Chunk implements IChunkAccess {
}
public void a(Entity entity, int i) {
+ org.spigotmc.AsyncCatcher.catchOp("Chunk remove entity"); // Tuinity // Tuinity
if (i < 0) {
i = 0;
}
@@ -631,7 +830,7 @@ public class Chunk implements IChunkAccess {
@@ -633,7 +830,7 @@ public class Chunk implements IChunkAccess {
entity.entitySlice = null;
entity.inChunk = false;
}
@@ -8848,7 +8832,7 @@ index af9d54ef057d5f6977cf77c57cde25b6b0d1f39d..ae07ea2a34f5cd82ce2eae523359cb75
return;
}
if (entity instanceof EntityItem) {
@@ -944,6 +1143,7 @@ public class Chunk implements IChunkAccess {
@@ -946,6 +1143,7 @@ public class Chunk implements IChunkAccess {
}
@@ -9907,7 +9891,7 @@ index 550232cb3819138b3bae0fa1c51429485e8bc593..229c3b0f0c650b501f31147adaa17194
throwable = throwable1;
throw throwable1;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f307a6361144c7e315b2e0ea45df27527cdb26ca..013c44f80f74376e8bbb37afb5de07aa5d8fb1bc 100644
index d8787985ab4c94e9808332c15b3d16d4b52ba195..2b76b5a70280def08f239ff387407a9d328d484c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16948,7 +16932,7 @@ index 85023c68a9c85802383cfcf52ec21392abdf3d85..44524e08bed8897e43e408b6f179bf79
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index d86c25593db7cc0a73db1c37af94ae4e41bb4e93..f34e1570052eac83fb3e03b3e361d8d4f451abac 100644
index 22eba9372d334c65d009721e808c958dfc271308..15ce459aa15a8bb936740a8c055f4304e21312d2 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -341,6 +341,14 @@ public class CraftWorld implements World {
@@ -17021,7 +17005,7 @@ index d86c25593db7cc0a73db1c37af94ae4e41bb4e93..f34e1570052eac83fb3e03b3e361d8d4
@Override
public boolean isChunkForceLoaded(int x, int z) {
return getHandle().getForceLoadedChunks().contains(ChunkCoordIntPair.pair(x, z));
@@ -2562,7 +2588,7 @@ public class CraftWorld implements World {
@@ -2567,7 +2593,7 @@ public class CraftWorld implements World {
}
return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> {
net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);