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 & Tuinity)

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

Paper Changes:
372dc10f Updated Upstream (CraftBukkit) (#4760)
d6fb9717 Updated Upstream (CraftBukkit)

Tuinity Changes:
2194b64 Optimizations (starlight, aka leaflight)
1a412ae Fix worldborder crash
957a2ef Fix chunk object leak
bcfe550 Re-Add unload poi data patch
This commit is contained in:
BillyGalbreath
2020-11-14 06:55:31 -06:00
parent f513a2f49b
commit 21e0b98494
23 changed files with 5714 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: f2606228bb...372dc10f91

2
current-paper
View File

@@ -1 +1 @@
1.16.4--
1.16.4--11496f974814db1c814249f94b605bf82c25822b

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

File diff suppressed because it is too large Load Diff

26
patches/server/0009-AFK-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index caaa01b20e..335cb9c4a9 100644
index caaa01b20..335cb9c4a 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -25,10 +25,10 @@ index caaa01b20e..335cb9c4a9 100644
super(EntityTypes.PLAYER, world);
this.bL = ItemStack.b;
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 56677b8bf4..77156ecff2 100644
index f8921eb83..c7cf49897 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1722,8 +1722,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1890,8 +1890,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void resetIdleTimer() {
this.ca = SystemUtils.getMonotonicMillis();
@@ -84,7 +84,7 @@ index 56677b8bf4..77156ecff2 100644
return this.serverStatisticManager;
}
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 40ca3364d4..9643dffc59 100644
index 40ca3364d..9643dffc5 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -149,28 +149,18 @@ public interface IEntityAccess {
@@ -129,7 +129,7 @@ index 40ca3364d4..9643dffc59 100644
@Nullable
diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
index 31eb6868c2..9f9d9b2de8 100644
index 31eb6868c..9f9d9b2de 100644
--- a/src/main/java/net/minecraft/server/IEntitySelector.java
+++ b/src/main/java/net/minecraft/server/IEntitySelector.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -154,7 +154,7 @@ index 31eb6868c2..9f9d9b2de8 100644
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index b89caa8ad1..4365d0bbb5 100644
index b89caa8ad..4365d0bbb 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -247,6 +247,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -198,10 +198,10 @@ index b89caa8ad1..4365d0bbb5 100644
if (from.getX() != Double.MAX_VALUE) {
Location oldTo = to.clone();
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 274a383be1..95159d501a 100644
index 0ac1bd39a..18e4fe468 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -982,7 +982,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -834,7 +834,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
// CraftBukkit end
if (this.everyoneSleeping && this.players.stream().noneMatch((entityplayer) -> {
@@ -210,7 +210,7 @@ index 274a383be1..95159d501a 100644
})) {
// CraftBukkit start
long l = this.worldData.getDayTime() + 24000L;
@@ -1303,7 +1303,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1171,7 +1171,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
while (iterator.hasNext()) {
EntityPlayer entityplayer = (EntityPlayer) iterator.next();
@@ -220,7 +220,7 @@ index 274a383be1..95159d501a 100644
} else if (entityplayer.isSleeping()) {
++j;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 803a7ff92a..d699a91685 100644
index 803a7ff92..d699a9168 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -1,6 +1,7 @@
@@ -248,7 +248,7 @@ index 803a7ff92a..d699a91685 100644
private static void timingsSettings() {
timingsUrl = getString("settings.timings.url", timingsUrl);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 361f7857e4..2578a4677d 100644
index 361f7857e..2578a4677 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -56,4 +56,15 @@ public class PurpurWorldConfig {
@@ -268,7 +268,7 @@ index 361f7857e4..2578a4677d 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f4f4e29f56..93c8f9fc8d 100644
index f4f4e29f5..93c8f9fc8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2216,4 +2216,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -294,7 +294,7 @@ index f4f4e29f56..93c8f9fc8d 100644
+ // Purpur end
}
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index 0b93635ba5..b47d6fa2de 100644
index 0b93635ba..b47d6fa2d 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -207,6 +207,7 @@ public class ActivationRange

18
patches/server/0021-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 77156ecff2..1360127549 100644
index c7cf49897..fd7099adc 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -147,6 +147,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -17,7 +17,7 @@ index 77156ecff2..1360127549 100644
}
// Paper start
public BlockPosition getPointInFront(double inFront) {
@@ -809,6 +811,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -977,6 +979,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@@ -30,7 +30,7 @@ index 77156ecff2..1360127549 100644
@Override
public boolean damageEntity(DamageSource damagesource, float f) {
if (this.isInvulnerable(damagesource)) {
@@ -816,7 +824,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -984,7 +992,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
} else {
boolean flag = this.server.j() && this.canPvP() && "fall".equals(damagesource.translationIndex);
@@ -39,7 +39,7 @@ index 77156ecff2..1360127549 100644
return false;
} else {
if (damagesource instanceof EntityDamageSource) {
@@ -987,6 +995,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1155,6 +1163,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
// CraftBukkit end
}
@@ -47,7 +47,7 @@ index 77156ecff2..1360127549 100644
return this;
}
}
@@ -2130,9 +2139,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2298,9 +2307,17 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isFrozen() { // Paper - protected > public
@@ -67,7 +67,7 @@ index 77156ecff2..1360127549 100644
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 4365d0bbb5..727975c26b 100644
index 4365d0bbb..727975c26 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1652,6 +1652,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -79,7 +79,7 @@ index 4365d0bbb5..727975c26b 100644
this.server.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(getPlayer(), packStatus));
// Paper end
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 38f26e25cb..c92a703da4 100644
index 38f26e25c..c92a703da 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -905,6 +905,8 @@ public abstract class PlayerList {
@@ -92,7 +92,7 @@ index 38f26e25cb..c92a703da4 100644
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 2578a4677d..c441fcea9b 100644
index 2578a4677..c441fcea9 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -67,4 +67,11 @@ public class PurpurWorldConfig {
@@ -108,7 +108,7 @@ index 2578a4677d..c441fcea9b 100644
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 93c8f9fc8d..21dc18c653 100644
index 93c8f9fc8..21dc18c65 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2232,5 +2232,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

6
patches/server/0033-Zombie-horse-naturally-spawn.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Zombie horse naturally spawn
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 95159d501a..8366d36300 100644
index 18e4fe468..c6f253d17 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -1180,12 +1180,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1048,12 +1048,18 @@ public class WorldServer extends World implements GeneratorAccessSeed {
boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
if (flag1) {
@@ -34,7 +34,7 @@ index 95159d501a..8366d36300 100644
EntityLightning entitylightning = (EntityLightning) EntityTypes.LIGHTNING_BOLT.a((World) this);
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 0073e3b85a..b652bfbdc3 100644
index 0073e3b85..b652bfbdc 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -145,4 +145,9 @@ public class PurpurWorldConfig {

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Cat spawning options
diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
index 9643dffc59..d9e6e78b15 100644
index 9643dffc5..d9e6e78b1 100644
--- a/src/main/java/net/minecraft/server/IEntityAccess.java
+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
@@ -44,6 +44,7 @@ public interface IEntityAccess {
@@ -17,7 +17,7 @@ index 9643dffc59..d9e6e78b15 100644
return this.a(oclass, axisalignedbb, IEntitySelector.g);
}
diff --git a/src/main/java/net/minecraft/server/MobSpawnerCat.java b/src/main/java/net/minecraft/server/MobSpawnerCat.java
index 5e17868a76..6d0ebd8afe 100644
index 5e17868a7..6d0ebd8af 100644
--- a/src/main/java/net/minecraft/server/MobSpawnerCat.java
+++ b/src/main/java/net/minecraft/server/MobSpawnerCat.java
@@ -16,7 +16,7 @@ public class MobSpawnerCat implements MobSpawner {
@@ -62,10 +62,10 @@ index 5e17868a76..6d0ebd8afe 100644
}
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index 3c9668c9c3..f460e76ea7 100644
index 99778f80c..be2ff3547 100644
--- a/src/main/java/net/minecraft/server/VillagePlace.java
+++ b/src/main/java/net/minecraft/server/VillagePlace.java
@@ -45,6 +45,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -177,6 +177,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
((VillagePlaceSection) this.e(SectionPosition.a(blockposition).s())).a(blockposition);
}
@@ -74,7 +74,7 @@ index 3c9668c9c3..f460e76ea7 100644
return this.c(predicate, blockposition, i, villageplace_occupancy).count();
}
diff --git a/src/main/java/net/minecraft/server/VillagePlaceType.java b/src/main/java/net/minecraft/server/VillagePlaceType.java
index a5718af9b6..b6b4c8c491 100644
index a5718af9b..b6b4c8c49 100644
--- a/src/main/java/net/minecraft/server/VillagePlaceType.java
+++ b/src/main/java/net/minecraft/server/VillagePlaceType.java
@@ -44,7 +44,7 @@ public class VillagePlaceType {
@@ -95,10 +95,10 @@ index a5718af9b6..b6b4c8c491 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 8366d36300..0b3a605a2f 100644
index c6f253d17..9b04b97b7 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -2561,6 +2561,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -2560,6 +2560,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
}
}
@@ -107,7 +107,7 @@ index 8366d36300..0b3a605a2f 100644
return this.getChunkProvider().j();
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index f01c74a2ea..b32f4d74a0 100644
index f01c74a2e..b32f4d74a 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -118,6 +118,15 @@ public class PurpurWorldConfig {

10
patches/server/0045-Cows-eat-mushrooms.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0822179590..9c781fed14 100644
index 870868f0e..1987555a9 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2777,6 +2777,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2766,6 +2766,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}
@@ -17,7 +17,7 @@ index 0822179590..9c781fed14 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 42e6761c8b..cfb009c811 100644
index 42e6761c8..cfb009c81 100644
--- a/src/main/java/net/minecraft/server/EntityCow.java
+++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -16,6 +16,7 @@ public class EntityCow extends EntityAnimal {
@@ -110,7 +110,7 @@ index 42e6761c8b..cfb009c811 100644
public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) {
return (EntityCow) EntityTypes.COW.a((World) worldserver);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 76ff4dd90e..5c79c50acd 100644
index 76ff4dd90..5c79c50ac 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -81,7 +81,7 @@ public abstract class EntityLiving extends Entity {
@@ -123,7 +123,7 @@ index 76ff4dd90e..5c79c50acd 100644
public float aC;
public float aD;
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index b32f4d74a0..d8bd7ffd5f 100644
index b32f4d74a..d8bd7ffd5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -132,6 +132,11 @@ public class PurpurWorldConfig {

14
patches/server/0054-Controllable-Minecarts.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Controllable Minecarts
diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
index 2291135eae..bc61aaff65 100644
index 2291135ea..bc61aaff6 100644
--- a/src/main/java/net/minecraft/server/BlockPosition.java
+++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -36,6 +36,12 @@ public class BlockPosition extends BaseBlockPosition {
@@ -22,7 +22,7 @@ index 2291135eae..bc61aaff65 100644
super(i, j, k);
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 5c79c50acd..4f75fe92bb 100644
index 5c79c50ac..4f75fe92b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -99,9 +99,9 @@ public abstract class EntityLiving extends Entity {
@@ -39,7 +39,7 @@ index 5c79c50acd..4f75fe92bb 100644
protected double aV;
protected double aW;
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
index 9af2bb3928..28808712e2 100644
index 9af2bb392..28808712e 100644
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -445,16 +445,62 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -106,10 +106,10 @@ index 9af2bb3928..28808712e2 100644
this.move(EnumMoveType.SELF, this.getMot());
if (!this.onGround) {
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index b514dddbe6..8077a3af19 100644
index 652ee3d3d..ed667f727 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -822,6 +822,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -990,6 +990,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
if (this.isInvulnerable(damagesource)) {
return false;
} else {
@@ -118,7 +118,7 @@ index b514dddbe6..8077a3af19 100644
if (!flag && isSpawnInvulnerable() && damagesource != DamageSource.OUT_OF_WORLD) { // Purpur
diff --git a/src/main/java/net/minecraft/server/ItemMinecart.java b/src/main/java/net/minecraft/server/ItemMinecart.java
index ceef7aaf92..002651aaf3 100644
index ceef7aaf9..002651aaf 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 {
@@ -143,7 +143,7 @@ index ceef7aaf92..002651aaf3 100644
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 3721bd745e..4c3e13cf66 100644
index 3721bd745..4c3e13cf6 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -1,5 +1,7 @@

4
patches/server/0056-Players-should-not-cram-to-death.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Players should not cram to death
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 8077a3af19..add0a4d600 100644
index ed667f727..287a496ee 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1224,7 +1224,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1392,7 +1392,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@Override
public boolean isInvulnerable(DamageSource damagesource) {

4
patches/server/0060-Fix-the-dead-lagging-the-server.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 41cba0914..0bc12fa32 100644
index 1987555a9..01f4be387 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1529,6 +1529,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1518,6 +1518,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
this.lastYaw = this.yaw;
this.lastPitch = this.pitch;

8
patches/server/0082-Climbing-should-not-bypass-cramming-gamerule.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Climbing should not bypass cramming gamerule
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4763dca41..6a9318318 100644
index e0532f145..763625294 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1728,6 +1728,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1717,6 +1717,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean isCollidable() {
@@ -131,10 +131,10 @@ index 1c682a62b..f7b92078e 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 7902cc7f1..a761bfea4 100644
index 287a496ee..9159601da 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1776,8 +1776,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1944,8 +1944,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
@Override

4
patches/server/0085-Item-entity-immunities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 6a9318318..e14aa4fd9 100644
index 763625294..f03890d40 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1478,6 +1478,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1467,6 +1467,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}

4
patches/server/0088-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -17,10 +17,10 @@ index 6fe5678cf..bd0267ee4 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 e14aa4fd9..fb850c99c 100644
index f03890d40..1ae6dd961 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2143,8 +2143,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2132,8 +2132,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(new ItemStack(imaterial), (float) i);
}

4
patches/server/0104-Fix-death-message-colors.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix death message colors
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index a761bfea4..6a2f9d831 100644
index 9159601da..cf7739164 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -670,7 +670,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -838,7 +838,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();

4
patches/server/0106-Populator-seed-controls.patch
View File

@@ -18,7 +18,7 @@ index dae2e5d70..55b67f105 100644
}
final Object val = config.get(key);
diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
index 048139d13..51a2ec468 100644
index 42ce3b802..03e4d9d8b 100644
--- a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
+++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
@@ -1,5 +1,6 @@
@@ -28,7 +28,7 @@ index 048139d13..51a2ec468 100644
import com.destroystokyo.paper.util.SneakyThrow;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.TicketType;
@@ -370,6 +371,19 @@ public final class TuinityConfig {
@@ -376,6 +377,19 @@ public final class TuinityConfig {
this.spawnLimitAmbient = this.getInt(path + ".ambient", -1);
}

6
patches/server/0112-Add-no-tick-block-list.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add no-tick block list
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 2760b377d..334b5e806 100644
index 4d1ac4e6b..483756316 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -576,10 +576,12 @@ public abstract class BlockBase {
@@ -655,10 +655,12 @@ public abstract class BlockBase {
}
public void a(WorldServer worldserver, BlockPosition blockposition, Random random) {
@@ -22,7 +22,7 @@ index 2760b377d..334b5e806 100644
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 0b3a605a2..51a25349c 100644
index 9b04b97b7..f3bc74d35 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -313,14 +313,14 @@ public class WorldServer extends World implements GeneratorAccessSeed {

4
patches/server/0116-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fb850c99c..ed7a66c03 100644
index 1ae6dd961..b433bf6e6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3446,8 +3446,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3435,8 +3435,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.lastYaw = this.yaw;
}

20
patches/server/0117-Ridables.patch
View File

@@ -161,7 +161,7 @@ index bd0267ee4..8b36ac2b0 100644
this.B = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index ed7a66c03..4f16bfc7d 100644
index b433bf6e6..ec755b0f2 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -200,7 +200,7 @@ index ed7a66c03..4f16bfc7d 100644
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -1488,6 +1488,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1477,6 +1477,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
}
@@ -208,7 +208,7 @@ index ed7a66c03..4f16bfc7d 100644
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2243,6 +2244,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2232,6 +2233,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(entity, false);
}
@@ -216,7 +216,7 @@ index ed7a66c03..4f16bfc7d 100644
public boolean a(Entity entity, boolean flag) {
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
if (entity1.vehicle == this) {
@@ -2338,6 +2340,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2327,6 +2329,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.passengers.add(entity);
}
@@ -230,7 +230,7 @@ index ed7a66c03..4f16bfc7d 100644
}
return true; // CraftBukkit
}
@@ -2378,6 +2387,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2367,6 +2376,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -243,7 +243,7 @@ index ed7a66c03..4f16bfc7d 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2543,6 +2558,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2532,6 +2547,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -251,7 +251,7 @@ index ed7a66c03..4f16bfc7d 100644
public boolean bE() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2765,6 +2781,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2754,6 +2770,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -259,7 +259,7 @@ index ed7a66c03..4f16bfc7d 100644
public void n(float f) {}
public boolean bL() {
@@ -3199,6 +3216,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3188,6 +3205,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -278,7 +278,7 @@ index ed7a66c03..4f16bfc7d 100644
@Override
public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
@@ -3651,4 +3680,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3640,4 +3669,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
}
// Paper end
@@ -3189,7 +3189,7 @@ index a3a428da9..cf7de0127 100644
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 6a2f9d831..51736dfde 100644
index cf7739164..47f881d74 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -505,6 +505,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

4
patches/server/0119-Crying-obsidian-valid-for-portal-frames.patch
View File

@@ -17,10 +17,10 @@ index 372ee6adc..4aa2b38f1 100644
return this == block;
}
diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
index 334b5e806..0e16fba76 100644
index 483756316..5550693a4 100644
--- a/src/main/java/net/minecraft/server/BlockBase.java
+++ b/src/main/java/net/minecraft/server/BlockBase.java
@@ -646,6 +646,7 @@ public abstract class BlockBase {
@@ -725,6 +725,7 @@ public abstract class BlockBase {
return this.getBlock().a(tag) && predicate.test(this);
}

6
patches/server/0120-Entities-can-use-portals-configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 4f16bfc7d..f65bb0276 100644
index ec755b0f2..14d6d2ef0 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2419,7 +2419,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2408,7 +2408,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void d(BlockPosition blockposition) {
if (this.ai()) {
this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 4f16bfc7d..f65bb0276 100644
if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
this.ac = blockposition.immutableCopy();
}
@@ -2992,7 +2992,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2981,7 +2981,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {

6
patches/server/0134-Configurable-daylight-cycle.patch
View File

@@ -18,7 +18,7 @@ index 15af5927f..c9c2e9774 100644
public PacketPlayOutUpdateTime() {}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 32d085474..63e326795 100644
index ab4a5534e..90416b184 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -94,6 +94,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -37,7 +37,7 @@ index 32d085474..63e326795 100644
}
// Tuinity start - optimise collision
@@ -1147,7 +1149,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1015,7 +1017,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
this.nextTickListBlock.nextTick(); // Paper
this.nextTickListFluid.nextTick(); // Paper
this.worldDataServer.u().a(this.server, i);
@@ -60,7 +60,7 @@ index 32d085474..63e326795 100644
this.setDayTime(this.worldData.getDayTime() + 1L);
}
@@ -1156,6 +1172,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -1024,6 +1040,12 @@ public class WorldServer extends World implements GeneratorAccessSeed {
public void setDayTime(long i) {
this.worldDataServer.setDayTime(i);

4
patches/server/0138-Add-tablist-suffix-option-for-afk.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add tablist suffix option for afk
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 51736dfde..2ee0fa074 100644
index 47f881d74..81237e538 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1790,7 +1790,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1958,7 +1958,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
if (world.purpurConfig.idleTimeoutUpdateTabList) {