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:
82792f883 [Auto] Updated Upstream (CraftBukkit)
899bc53b7 Updated Upstream (Bukkit/CraftBukkit) (#4779)
This commit is contained in:
BillyGalbreath
2020-11-18 21:12:53 -06:00
parent 56569681b4
commit b6f937317f
7 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: a162213b24...82792f883f

2
current-paper
View File

@@ -1 +1 @@
1.16.4--
1.16.4--f3e24bfd596d4a095bab3d78733012a035d02546

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

@@ -13800,7 +13800,7 @@ index f01186988..26a8c4ffe 100644
return this.j.d();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index b19681031..0ac1bd39a 100644
index 5b0b6edfa..2155fa1b1 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -55,12 +55,13 @@ import org.bukkit.event.server.MapInitializeEvent;
@@ -14382,7 +14382,7 @@ index b19681031..0ac1bd39a 100644
}
public void a(Entity entity, Entity entity1) {
@@ -919,6 +1363,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -920,6 +1364,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
int i = MathHelper.floor(entity.locX() / 16.0D);
int j = Math.min(15, Math.max(0, MathHelper.floor(entity.locY() / 16.0D))); // Paper - stay consistent with chunk add/remove behavior
int k = MathHelper.floor(entity.locZ() / 16.0D);
@@ -14395,7 +14395,7 @@ index b19681031..0ac1bd39a 100644
if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) {
// Paper start - remove entity if its in a chunk more correctly.
@@ -928,6 +1378,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -929,6 +1379,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
// Paper end
@@ -14408,7 +14408,7 @@ index b19681031..0ac1bd39a 100644
if (entity.inChunk && this.isChunkLoaded(entity.chunkX, entity.chunkZ)) {
this.getChunkAt(entity.chunkX, entity.chunkZ).a(entity, entity.chunkY);
}
@@ -941,6 +1397,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -942,6 +1398,11 @@ public class WorldServer extends World implements GeneratorAccessSeed {
} else {
this.getChunkAt(i, k).a(entity);
}
@@ -14420,7 +14420,7 @@ index b19681031..0ac1bd39a 100644
}
this.getMethodProfiler().exit();
@@ -1299,7 +1760,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1297,7 +1758,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
Entity entity = (Entity) iterator.next();
if (!(entity instanceof EntityPlayer)) {
@@ -14429,7 +14429,7 @@ index b19681031..0ac1bd39a 100644
throw (IllegalStateException) SystemUtils.c((Throwable) (new IllegalStateException("Removing entity while ticking!")));
}
@@ -1327,6 +1788,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1325,6 +1786,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void unregisterEntity(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot
@@ -14437,7 +14437,7 @@ index b19681031..0ac1bd39a 100644
// Paper start - fix entity registration issues
if (entity instanceof EntityComplexPart) {
// Usually this is a no-op for complex parts, and ID's should be removed, but go ahead and remove it anyways
@@ -1393,17 +1855,108 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1391,17 +1853,108 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.getScoreboard().a(entity);
// CraftBukkit start - SPIGOT-5278
if (entity instanceof EntityDrowned) {
@@ -14549,7 +14549,7 @@ index b19681031..0ac1bd39a 100644
private void registerEntity(Entity entity) {
org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
// Paper start - don't double enqueue entity registration
@@ -1414,7 +1967,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1412,7 +1965,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
return;
}
// Paper end
@@ -14558,7 +14558,7 @@ index b19681031..0ac1bd39a 100644
if (!entity.isQueuedForRegister) { // Paper
this.entitiesToAdd.add(entity);
entity.isQueuedForRegister = true; // Paper
@@ -1422,6 +1975,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1420,6 +1973,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
} else {
entity.isQueuedForRegister = false; // Paper
this.entitiesById.put(entity.getId(), entity);
@@ -14566,7 +14566,7 @@ index b19681031..0ac1bd39a 100644
if (entity instanceof EntityEnderDragon) {
EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).eJ();
int i = aentitycomplexpart.length;
@@ -1430,6 +1984,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1428,6 +1982,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
EntityComplexPart entitycomplexpart = aentitycomplexpart[j];
this.entitiesById.put(entitycomplexpart.getId(), entitycomplexpart);
@@ -14574,7 +14574,7 @@ index b19681031..0ac1bd39a 100644
}
}
@@ -1454,12 +2009,16 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1452,12 +2007,16 @@ public class WorldServer extends World implements GeneratorAccessSeed {
// this.getChunkProvider().addEntity(entity); // Paper - moved down below valid=true
// CraftBukkit start - SPIGOT-5278
if (entity instanceof EntityDrowned) {
@@ -14594,7 +14594,7 @@ index b19681031..0ac1bd39a 100644
}
entity.valid = true; // CraftBukkit
this.getChunkProvider().addEntity(entity); // Paper - from above to be below valid=true
@@ -1475,7 +2034,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1473,7 +2032,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
public void removeEntity(Entity entity) {
@@ -14603,7 +14603,7 @@ index b19681031..0ac1bd39a 100644
throw (IllegalStateException) SystemUtils.c((Throwable) (new IllegalStateException("Removing entity while ticking!")));
} else {
this.removeEntityFromChunk(entity);
@@ -1571,13 +2130,32 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1569,13 +2128,32 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@Override
public void notify(BlockPosition blockposition, IBlockData iblockdata, IBlockData iblockdata1, int i) {
@@ -14637,7 +14637,7 @@ index b19681031..0ac1bd39a 100644
while (iterator.hasNext()) {
NavigationAbstract navigationabstract = (NavigationAbstract) iterator.next();
@@ -1585,7 +2163,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1583,7 +2161,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
if (!navigationabstract.i()) {
navigationabstract.b(blockposition);
}

6
patches/server/0015-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index a71ad8418..bf5436510 100644
index bf914dc5e..1138981ae 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -143,6 +143,16 @@ public class EntityTypes<T extends Entity> {
@@ -25,7 +25,7 @@ index a71ad8418..bf5436510 100644
public static MinecraftKey getName(EntityTypes<?> entitytypes) {
return IRegistry.ENTITY_TYPE.getKey(entitytypes);
}
@@ -286,6 +296,16 @@ public class EntityTypes<T extends Entity> {
@@ -287,6 +297,16 @@ public class EntityTypes<T extends Entity> {
return this.bg;
}
@@ -42,7 +42,7 @@ index a71ad8418..bf5436510 100644
public String getDescriptionId() { return f(); } // Paper - OBFHELPER
public String f() {
if (this.bo == null) {
@@ -295,6 +315,7 @@ public class EntityTypes<T extends Entity> {
@@ -296,6 +316,7 @@ public class EntityTypes<T extends Entity> {
return this.bo;
}

12
patches/server/0016-EMC-MonsterEggSpawnEvent.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] EMC - MonsterEggSpawnEvent
diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
index bf5436510..b089c8a3f 100644
index 1138981ae..37b984a5b 100644
--- a/src/main/java/net/minecraft/server/EntityTypes.java
+++ b/src/main/java/net/minecraft/server/EntityTypes.java
@@ -187,19 +187,45 @@ public class EntityTypes<T extends Entity> {
@@ -187,19 +187,46 @@ public class EntityTypes<T extends Entity> {
@Nullable
public Entity spawnCreature(WorldServer worldserver, @Nullable ItemStack itemstack, @Nullable EntityHuman entityhuman, BlockPosition blockposition, EnumMobSpawn enummobspawn, boolean flag, boolean flag1) {
@@ -26,7 +26,8 @@ index bf5436510..b089c8a3f 100644
+ public T spawnCreature(WorldServer worldserver, @Nullable ItemStack itemstack, @Nullable NBTTagCompound nbttagcompound, @Nullable IChatBaseComponent ichatbasecomponent, @Nullable EntityHuman entityhuman, BlockPosition blockposition, EnumMobSpawn enummobspawn, boolean flag, boolean flag1) {
+ // Purpur end
// CraftBukkit start
return this.spawnCreature(worldserver, nbttagcompound, ichatbasecomponent, entityhuman, blockposition, enummobspawn, flag, flag1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
- return this.spawnCreature(worldserver, nbttagcompound, ichatbasecomponent, entityhuman, blockposition, enummobspawn, flag, flag1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG);
+ return this.spawnCreature(worldserver, itemstack, nbttagcompound, ichatbasecomponent, entityhuman, blockposition, enummobspawn, flag, flag1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER_EGG); // Purpur
}
@Nullable
@@ -34,6 +35,7 @@ index bf5436510..b089c8a3f 100644
+ // Purpur start
+ return spawnCreature(worldserver, null, nbttagcompound, ichatbasecomponent, entityhuman, blockposition, enummobspawn, flag, flag1, spawnReason);
+ }
+
+ @Nullable
+ public T spawnCreature(WorldServer worldserver, @Nullable ItemStack itemstack, @Nullable NBTTagCompound nbttagcompound, @Nullable IChatBaseComponent ichatbasecomponent, @Nullable EntityHuman entityhuman, BlockPosition blockposition, EnumMobSpawn enummobspawn, boolean flag, boolean flag1, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
+ // Purpur end
@@ -53,5 +55,5 @@ index bf5436510..b089c8a3f 100644
+ // Purpur end
+
if (t0 != null) {
return worldserver.addAllEntities(t0, spawnReason) ? t0 : null; // Don't return an entity when CreatureSpawnEvent is canceled
// CraftBukkit end
worldserver.addAllEntities(t0, spawnReason);
return !t0.dead ? t0 : null; // Don't return an entity when CreatureSpawnEvent is canceled

4
patches/server/0043-Cat-spawning-options.patch
View File

@@ -95,10 +95,10 @@ index a5718af9b..b6b4c8c49 100644
return this.E;
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index c6f253d17..9b04b97b7 100644
index 7ef1987c0..5bd432374 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2560,6 +2560,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2558,6 +2558,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
}

6
patches/server/0090-Add-phantom-spawning-options.patch
View File

@@ -221,10 +221,10 @@ index 4e3f01bc7..ac1ea2f0c 100644
}
}
diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
index beaea041d..ce8834980 100644
index 6c1540998..8eadfae52 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
@@ -386,6 +386,7 @@ public final class SpawnerCreature {
@@ -387,6 +387,7 @@ public final class SpawnerCreature {
return new BlockPosition(i, l, j);
}
@@ -233,7 +233,7 @@ index beaea041d..ce8834980 100644
return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ab8fad689..baa8d23a9 100644
index ee56f23d0..8f6948f52 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1564,6 +1564,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {