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 appears to apply and compile correctly

Paper Changes:
a41d51f0 ServerExceptionEvent can be fired off main
920ad7c7 Use getChunkIfLoadedImmediately in places (#2297)
0708fa36 Updated Upstream (CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-07-18 14:55:21 -05:00
parent 20943ff953
commit 86da2ca8ad
15 changed files with 192 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0003-cows-to-mooshroom-when-fed-mushrooms.patch
View File

@@ -1,4 +1,4 @@
From d81500d5df09102a2ad579f7a97e75b131868bce Mon Sep 17 00:00:00 2001
From 75fe428f000ffd41067998de596f76d9c5688285 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:10:30 -0500
Subject: [PATCH] cows to mooshroom when fed mushrooms
@@ -11,10 +11,10 @@ Subject: [PATCH] cows to mooshroom when fed mushrooms
4 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0a2c9a9f8..dd7da4117 100644
index 9485bc4810..58ccb3fc47 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1048,6 +1048,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1049,6 +1049,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -22,7 +22,7 @@ index 0a2c9a9f8..dd7da4117 100644
public void a(SoundEffect soundeffect, float f, float f1) {
if (!this.isSilent()) {
this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, soundeffect, this.getSoundCategory(), f, f1);
@@ -2545,6 +2546,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2546,6 +2547,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}
@@ -31,7 +31,7 @@ index 0a2c9a9f8..dd7da4117 100644
this.setPositionRotation(entity.locX, entity.locY, entity.locZ, entity.yaw, entity.pitch);
}
diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
index d2c2e3cc3..c3aef0b2a 100644
index d2c2e3cc33..c3aef0b2a1 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -16,7 +16,7 @@ public class EntityCow extends EntityAnimal {
@@ -125,7 +125,7 @@ index d2c2e3cc3..c3aef0b2a 100644
public EntityCow createChild(EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a(this.world);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index d44ea9ec5..84bc1a629 100644
index d44ea9ec5d..84bc1a6290 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2742,8 +2742,14 @@ public abstract class EntityLiving extends Entity {
@@ -146,7 +146,7 @@ index d44ea9ec5..84bc1a629 100644
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b0f0040a4..d433eca03 100644
index b0f0040a4a..d433eca03b 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -130,4 +130,9 @@ public class PurpurConfig {

16
patches/server/0010-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -1,4 +1,4 @@
From f6c6b9e66cc428f9b1b9f697c6dfedaba39c2ef2 Mon Sep 17 00:00:00 2001
From 0c3db9d4235a0c274c801aa229b9753e09203337 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 9 May 2019 18:26:06 -0500
Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
@@ -12,7 +12,7 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
5 files changed, 219 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/minecraft/server/DamageSource.java b/src/main/java/net/minecraft/server/DamageSource.java
index 730a15f33..31454349a 100644
index 730a15f332..31454349a2 100644
--- a/src/main/java/net/minecraft/server/DamageSource.java
+++ b/src/main/java/net/minecraft/server/DamageSource.java
@@ -77,6 +77,7 @@ public class DamageSource {
@@ -24,10 +24,10 @@ index 730a15f33..31454349a 100644
return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index dd7da4117..adfd6e855 100644
index 58ccb3fc47..2646e156b0 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1399,6 +1399,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1400,6 +1400,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return d3 * d3 + d4 * d4 + d5 * d5;
}
@@ -35,7 +35,7 @@ index dd7da4117..adfd6e855 100644
public double h(Entity entity) {
return this.c(entity.ci());
}
@@ -1918,14 +1919,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1919,14 +1920,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(new ItemStack(imaterial), (float) i);
}
@@ -54,7 +54,7 @@ index dd7da4117..adfd6e855 100644
return null;
} else if (this.world.isClientSide) {
diff --git a/src/main/java/net/minecraft/server/EntityEnderCrystal.java b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
index 801552fc6..ad88cc982 100644
index 801552fc61..ad88cc9822 100644
--- a/src/main/java/net/minecraft/server/EntityEnderCrystal.java
+++ b/src/main/java/net/minecraft/server/EntityEnderCrystal.java
@@ -13,6 +13,12 @@ public class EntityEnderCrystal extends Entity {
@@ -122,7 +122,7 @@ index 801552fc6..ad88cc982 100644
@Override
protected void b(NBTTagCompound nbttagcompound) {
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index b672ac5c2..e75914c2b 100644
index b672ac5c2a..e75914c2b1 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -8,9 +8,10 @@ import javax.annotation.Nullable;
@@ -351,7 +351,7 @@ index b672ac5c2..e75914c2b 100644
@Override
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 3a86c519c..9a0521f2a 100644
index 3a86c519c0..9a0521f2a5 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -30,6 +30,7 @@ public interface IEntityAccess {

272
patches/server/0011-Integrate-ridables.patch
View File

File diff suppressed because it is too large Load Diff

10
patches/server/0027-Allow-color-codes-on-signs.patch
View File

@@ -1,4 +1,4 @@
From 7e414462234062bc6c9f42a832f59a3c51685801 Mon Sep 17 00:00:00 2001
From b252252f673aa20d595976740254bf3a61637ca4 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Allow color codes on signs
@@ -23,10 +23,10 @@ index 633fe836dd..160c03efd8 100644
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 6d6e50313e..671d1085e0 100644
index c900e32cd4..f55e19c9b0 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2592,6 +2592,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2598,6 +2598,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end
@@ -35,7 +35,7 @@ index 6d6e50313e..671d1085e0 100644
}
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
index dd7889a4f9..2f9db45a12 100644
index 7e5d815938..f5e3b0b30d 100644
--- a/src/main/java/net/minecraft/server/TileEntitySign.java
+++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -122,6 +122,20 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //
@@ -60,7 +60,7 @@ index dd7889a4f9..2f9db45a12 100644
@Override
public PacketPlayOutTileEntityData getUpdatePacket() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 7f996591fa..490c2ede60 100644
index ee92fd26e6..1238864e7c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -91,4 +91,9 @@ public class PurpurWorldConfig {

12
patches/server/0036-Controllable-Minecarts.patch
View File

@@ -1,4 +1,4 @@
From ad2037fa2e77e678c33d9b5ae04401be4fe5559a Mon Sep 17 00:00:00 2001
From 49183cb290d3f37e227f35085aa5a8c878c5a926 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 29 Jun 2019 02:32:40 -0500
Subject: [PATCH] Controllable Minecarts
@@ -11,10 +11,10 @@ Subject: [PATCH] Controllable Minecarts
4 files changed, 75 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index cf5d829f6..66824d1a7 100644
index 7a3b819e70..b1afdf71bb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1294,6 +1294,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1295,6 +1295,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.inLava = true;
}
@@ -23,7 +23,7 @@ index cf5d829f6..66824d1a7 100644
return this.inLava;
}
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 6df2930e2..c5b4057c3 100644
index 6df2930e2d..c5b4057c33 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -4,6 +4,7 @@ import java.util.Iterator;
@@ -86,7 +86,7 @@ index 6df2930e2..c5b4057c3 100644
this.setMot(new Vec3D(this.getMot().x * this.derailedX, this.getMot().y * this.derailedY, this.getMot().z * this.derailedZ));
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index 764427456..456eced16 100644
index 7644274562..456eced16c 100644
--- a/src/main/java/net/minecraft/server/ItemMinecart.java
+++ b/src/main/java/net/minecraft/server/ItemMinecart.java
@@ -103,8 +103,10 @@ public class ItemMinecart extends Item {
@@ -111,7 +111,7 @@ index 764427456..456eced16 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index a86b3fc9c..99c13caee 100644
index a86b3fc9ce..99c13caee6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,9 +1,13 @@

6
patches/server/0050-Prevent-entities-from-moving-in-unloaded-chunks.patch
View File

@@ -1,4 +1,4 @@
From d1315aeff30dfaa93dec34425ac1e3c0e4ee0ce1 Mon Sep 17 00:00:00 2001
From 45acaf6afc185ca3d39f570cc64f16a12b9b3dfa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 12 Jul 2019 16:18:55 -0500
Subject: [PATCH] Prevent entities from moving in unloaded chunks
@@ -8,10 +8,10 @@ Subject: [PATCH] Prevent entities from moving in unloaded chunks
1 file changed, 1 insertion(+)
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f1975fa36e..23fea2b6e8 100644
index b1afdf71bb..79fb1c6c8e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -576,6 +576,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -577,6 +577,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
int j = MathHelper.floor(this.locY - 0.20000000298023224D);
int k = MathHelper.floor(this.locZ);
BlockPosition blockposition = new BlockPosition(i, j, k);

32
patches/server/0052-Asynchronous-chunk-IO-and-loading.patch → patches/server/0051-Asynchronous-chunk-IO-and-loading.patch
View File

@@ -1,4 +1,4 @@
From da939406c7900f95e4c1888e8672968e38afe69a Mon Sep 17 00:00:00 2001
From c4a6f06f03a00f7c612b574ea996db5218711cd3 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 13 Jul 2019 09:23:10 -0700
Subject: [PATCH] Asynchronous chunk IO and loading
@@ -1593,7 +1593,7 @@ index 0000000000..8dbaaba3cd
+
+}
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index db9113994e..4f7c442264 100644
index d76860daf8..32a469025e 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -147,11 +147,143 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -1971,7 +1971,7 @@ index 0324a90ca5..430cd70cf5 100644
public String getServerIp() {
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index a439277813..f25ca782b9 100644
index 89b72da828..089a20c835 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -57,7 +57,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1992,7 +1992,7 @@ index a439277813..f25ca782b9 100644
private final File x;
private final PlayerMap playerMap;
public final Int2ObjectMap<PlayerChunkMap.EntityTracker> trackedEntities;
@@ -101,7 +101,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -126,7 +126,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
this.lightEngine = new LightEngineThreaded(ilightaccess, this, this.world.getWorldProvider().g(), threadedmailbox2, this.q.a(threadedmailbox2, false));
this.u = new PlayerChunkMap.a(executor, iasynctaskhandler);
this.m = supplier;
@@ -2001,7 +2001,7 @@ index a439277813..f25ca782b9 100644
this.setViewDistance(i);
}
@@ -261,6 +261,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -286,6 +286,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@Override
public void close() throws IOException {
this.q.close();
@@ -2009,7 +2009,7 @@ index a439277813..f25ca782b9 100644
this.n.close();
super.close();
}
@@ -308,7 +309,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -333,7 +334,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
shouldSave = ((Chunk) ichunkaccess).lastSaved + world.paperConfig.autoSavePeriod <= world.getTime();
}
@@ -2018,7 +2018,7 @@ index a439277813..f25ca782b9 100644
++savedThisTick;
playerchunk.m();
}
@@ -328,11 +329,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -353,11 +354,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
protected void unloadChunks(BooleanSupplier booleansupplier) {
GameProfilerFiller gameprofilerfiller = this.world.getMethodProfiler();
@@ -2034,7 +2034,7 @@ index a439277813..f25ca782b9 100644
}
gameprofilerfiller.exit();
@@ -386,7 +391,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -411,7 +416,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
((Chunk) ichunkaccess).setLoaded(false);
}
@@ -2043,7 +2043,7 @@ index a439277813..f25ca782b9 100644
if (this.loadedChunks.remove(i) && ichunkaccess instanceof Chunk) {
Chunk chunk = (Chunk) ichunkaccess;
@@ -462,26 +467,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -487,26 +492,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
}
@@ -2089,7 +2089,7 @@ index a439277813..f25ca782b9 100644
} catch (ReportedException reportedexception) {
Throwable throwable = reportedexception.getCause();
@@ -495,7 +504,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -520,7 +529,17 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}
return Either.left(new ProtoChunk(chunkcoordintpair, ChunkConverter.a, this.world)); // Paper - Anti-Xray
@@ -2108,7 +2108,7 @@ index a439277813..f25ca782b9 100644
}
private CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> b(PlayerChunk playerchunk, ChunkStatus chunkstatus) {
@@ -701,18 +720,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -726,18 +745,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
return this.v.get();
}
@@ -2159,7 +2159,7 @@ index a439277813..f25ca782b9 100644
ichunkaccess.setLastSaved(this.world.getTime());
ichunkaccess.setNeedsSaving(false);
@@ -723,27 +766,33 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -748,27 +791,33 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
NBTTagCompound nbttagcompound;
if (chunkstatus.getType() != ChunkStatus.Type.LEVELCHUNK) {
@@ -2196,7 +2196,7 @@ index a439277813..f25ca782b9 100644
}
protected void setViewDistance(int i) {
@@ -808,6 +857,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -833,6 +882,42 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
return Iterables.unmodifiableIterable(this.visibleChunks.values());
}
@@ -2239,7 +2239,7 @@ index a439277813..f25ca782b9 100644
@Nullable
public NBTTagCompound readChunkData(ChunkCoordIntPair chunkcoordintpair) throws IOException { // Paper - private -> public
NBTTagCompound nbttagcompound = this.read(chunkcoordintpair);
@@ -830,12 +915,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -855,12 +940,30 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
// Paper start - chunk status cache "api"
public ChunkStatus getChunkStatusOnDiskIfCached(ChunkCoordIntPair chunkPos) {
@@ -2270,7 +2270,7 @@ index a439277813..f25ca782b9 100644
RegionFile regionFile = this.getRegionFile(chunkPos, false);
if (!regionFile.chunkExists(chunkPos)) {
@@ -847,17 +950,49 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -872,17 +975,49 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
if (status != null) {
return status;
}
@@ -2322,7 +2322,7 @@ index a439277813..f25ca782b9 100644
// Paper end
// Spigot Start
@@ -1197,6 +1332,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1222,6 +1357,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}

53
patches/server/0051-isLoaded-calls-should-NOT-load-chunks.patch
View File

@@ -1,53 +0,0 @@
From 72375763835b492551ee6f6a3ebaba8d66e9988f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 12 Jul 2019 17:45:16 -0500
Subject: [PATCH] isLoaded calls should NOT load chunks...
---
src/main/java/net/minecraft/server/ChunkProviderServer.java | 2 +-
src/main/java/net/minecraft/server/FluidTypeLava.java | 2 +-
src/main/java/net/minecraft/server/World.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 539c65f855..db9113994e 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -164,7 +164,7 @@ public class ChunkProviderServer extends IChunkProvider {
for (int l = 0; l < 4; ++l) {
if (k == this.cachePos[l] && chunkstatus == this.cacheStatus[l]) {
ichunkaccess = this.cacheChunk[l];
- if (ichunkaccess != null) { // CraftBukkit - the chunk can become accessible in the meantime TODO for non-null chunks it might also make sense to check that the chunk's state hasn't changed in the meantime
+ if (ichunkaccess != null || !flag) { // CraftBukkit - the chunk can become accessible in the meantime TODO for non-null chunks it might also make sense to check that the chunk's state hasn't changed in the meantime // Purpur - put flag back
return ichunkaccess;
}
}
diff --git a/src/main/java/net/minecraft/server/FluidTypeLava.java b/src/main/java/net/minecraft/server/FluidTypeLava.java
index 2f9578e1cf..5f404fb721 100644
--- a/src/main/java/net/minecraft/server/FluidTypeLava.java
+++ b/src/main/java/net/minecraft/server/FluidTypeLava.java
@@ -94,7 +94,7 @@ public abstract class FluidTypeLava extends FluidTypeFlowing {
}
private boolean b(IWorldReader iworldreader, BlockPosition blockposition) {
- return blockposition.getY() >= 0 && blockposition.getY() < 256 && !iworldreader.isLoaded(blockposition) ? false : iworldreader.getType(blockposition).getMaterial().isBurnable();
+ return blockposition.getY() >= 0 && blockposition.getY() < 256 && !((WorldServer)iworldreader).isLoaded(blockposition) ? false : iworldreader.getType(blockposition).getMaterial().isBurnable(); // Purpur
}
@Override
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c86c9d1ecc..c80c659a38 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -133,7 +133,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
}
public Chunk getChunkIfLoaded(int x, int z) {
- return ((ChunkProviderServer) this.chunkProvider).getChunkAt(x, z, false);
+ return (Chunk) getChunkIfLoadedImmediately(x, z); // Purpur
}
protected World(WorldData worlddata, DimensionManager dimensionmanager, BiFunction<World, WorldProvider, IChunkProvider> bifunction, GameProfilerFiller gameprofilerfiller, boolean flag, org.bukkit.generator.ChunkGenerator gen, org.bukkit.World.Environment env) {
--
2.20.1

10
patches/server/0053-Implement-optional-per-player-mob-spawns.patch → patches/server/0052-Implement-optional-per-player-mob-spawns.patch
View File

@@ -1,4 +1,4 @@
From 3ff085046cf1d3efc53b2dec884c4d5b75cd0df3 Mon Sep 17 00:00:00 2001
From 9a9594c015e50f2e5bec425ef0ba6c9bd11cb674 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Tue, 11 Jun 2019 22:22:16 -0400
Subject: [PATCH] Implement optional per player mob spawns
@@ -29,7 +29,7 @@ index ff520d9e86..5ed02f6485 100644
public boolean asynchronous;
public EngineMode engineMode;
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 4f7c442264..9f6c362dd1 100644
index 32a469025e..688573276d 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -582,9 +582,21 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -57,10 +57,10 @@ index 4f7c442264..9f6c362dd1 100644
}
}
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index f25ca782b9..a235df4185 100644
index 089a20c835..038b0f9fb1 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -105,6 +105,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -130,6 +130,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
this.setViewDistance(i);
}
@@ -68,7 +68,7 @@ index f25ca782b9..a235df4185 100644
private static double a(ChunkCoordIntPair chunkcoordintpair, Entity entity) {
double d0 = (double) (chunkcoordintpair.x * 16 + 8);
double d1 = (double) (chunkcoordintpair.z * 16 + 8);
@@ -1157,6 +1158,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -1182,6 +1183,15 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
}

2
patches/server/0054-Tulips-change-fox-type.patch → patches/server/0053-Tulips-change-fox-type.patch
View File

@@ -1,4 +1,4 @@
From dc255f32785831cfa041105a377ea880926762f8 Mon Sep 17 00:00:00 2001
From 902ff47413092187f4aa5dcd657b3d497e7c0c85 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 13 Jul 2019 15:56:22 -0500
Subject: [PATCH] Tulips change fox type

2
patches/server/0055-Prevent-enderman-teleporting-into-unloaded-chunks.patch → patches/server/0054-Prevent-enderman-teleporting-into-unloaded-chunks.patch
View File

@@ -1,4 +1,4 @@
From 3aa92d8e98f4ef431ad18fe137bbdd01f4a2f970 Mon Sep 17 00:00:00 2001
From c5ee4071c9329bf54928f2701a7d7402e56d9b88 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 13 Jul 2019 18:41:37 -0500
Subject: [PATCH] Prevent enderman teleporting into unloaded chunks

2
patches/server/0056-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch → patches/server/0055-Prevent-zombies-spawning-reinforcements-in-unloaded-.patch
View File

@@ -1,4 +1,4 @@
From bc6361e47b89f6a225b13b5c2dfb44d1f2f7968f Mon Sep 17 00:00:00 2001
From 2743ab191c1f49d276cac635ad2c2d1893847ddb Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 13 Jul 2019 18:50:05 -0500
Subject: [PATCH] Prevent zombies spawning reinforcements in unloaded chunks

2
patches/server/0057-Mending-mends-most-damages-equipment-first.patch → patches/server/0056-Mending-mends-most-damages-equipment-first.patch
View File

@@ -1,4 +1,4 @@
From b3cc317cb6d83594cd0aaa508019925a939d03a5 Mon Sep 17 00:00:00 2001
From b766921c717b726c90756aecad10a8603016a11c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 14 Jul 2019 19:52:47 -0500
Subject: [PATCH] Mending mends most damages equipment first