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:
PaperMC/Paper@cfe3ad1 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@02b5ec4 fix 2 more migration issues
This commit is contained in:
William Blake Galbreath
2022-06-09 23:54:39 -05:00
parent 17ea327e08
commit a214265592
13 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = 83e2a3582bbeea78b54b7430ebe0c336e97e5575
paperCommit = 02b5ec4c7880c5a22f4add590ef559dae4d768db
org.gradle.caching = true
org.gradle.parallel = true

8
patches/api/0038-Extended-OfflinePlayer-API.patch
View File

@@ -5,13 +5,13 @@ Subject: [PATCH] Extended OfflinePlayer API
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
index 23e853bae0e051cd43deb9eb24c54e74a56d8ab0..00ea8a17cec2b2fbc030ef1d3fc22fcb25a82cd8 100644
index a7d1f1e701f23e851f735584a30bedadb0d8b9bd..7da38adede5b752583b94f6a14b3e45d0fd10209 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -447,4 +447,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
* for the statistic
@@ -455,4 +455,114 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
*/
public void setStatistic(@NotNull Statistic statistic, @NotNull EntityType entityType, int newValue);
@Nullable
public Location getLastDeathLocation();
+
+ // Purpur start - OfflinePlayer API
+ /**

14
patches/server/0005-Ridables.patch
View File

@@ -22,7 +22,7 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9df1401eb9361df0532b8f5fbfbb46e9923ae558..0d024cf636e0a6fa430fc6f920375e9e353beda3 100644
index ef42da89af85367d7733de8896ce8dc45ea12d36..257ab642762724ea9ed1bab719e1f7844835e410 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1531,6 +1531,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -34,10 +34,10 @@ index 9df1401eb9361df0532b8f5fbfbb46e9923ae558..0d024cf636e0a6fa430fc6f920375e9e
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index c18363c8d582a88cbc80842c9e50acb1b941ba14..190e453e5d30e028520e36b651480caa4457d5ff 100644
index aaa7ad2a14389dc0dbc0d0fa3fb5ea16ec4172f6..d3624f5a4e3ab9f09d1588a648acba6920e95cfc 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -217,6 +217,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -218,6 +218,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
public boolean hasPhysicsEvent = true; // Paper
public boolean hasEntityMoveEvent = false; // Paper
private final alternate.current.wire.WireHandler wireHandler = new alternate.current.wire.WireHandler(this); // Paper - optimize redstone (Alternate Current)
@@ -46,7 +46,7 @@ index c18363c8d582a88cbc80842c9e50acb1b941ba14..190e453e5d30e028520e36b651480caa
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index cfc3645215b18f76514acfdab63718adcdc5d938..7a28ac8d31ed5712e6fb2fbd59c72be5855165fe 100644
index 070b7d49b46e6e23b4baf33ac045582194579137..f4b33e5788665eefef35e701ed99d58d0ea1b3c2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -668,6 +668,15 @@ public class ServerPlayer extends Player {
@@ -2569,7 +2569,7 @@ index 305a891e4b51d1031d9e9238ff00e2ea7de8d954..84625d09df800fcfd477fc493fb5f824
protected void defineSynchedData() {
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
index 69c6a0c64ef5371dc57da1fdb60a8ac295bf327a..314454b8c0197002c6c2529ffb75724de16cf7a6 100644
index 219877901fb5fc6401646253d6e5d7bd8416ffe1..079a85f1520cda6a0fb72d0dd7f9e18aec6a6c91 100644
--- a/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
+++ b/src/main/java/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
@@ -103,6 +103,7 @@ public class EnderDragon extends Mob implements Enemy {
@@ -2718,7 +2718,7 @@ index 69c6a0c64ef5371dc57da1fdb60a8ac295bf327a..314454b8c0197002c6c2529ffb75724d
this.dragonFight.updateDragon(this);
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index b3e2e834f4f151497bf842796dd8e3a8b5143f1b..b271c8b1aa75df1b9e0d7b011aacacccfe5ea4bc 100644
index 4fb40aa91e0961f1974c74c88fa68359e4ad6b16..dd7bd70e0b905eea690c2d20b8438b9476d2badc 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -84,6 +84,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -4028,7 +4028,7 @@ index 3a3f3358c4bbd16bdcadc56c6a865ecfb942ad54..e73644f453bed8523bfad47764018362
protected void defineSynchedData() {
super.defineSynchedData();
diff --git a/src/main/java/net/minecraft/world/entity/monster/Slime.java b/src/main/java/net/minecraft/world/entity/monster/Slime.java
index ae95867efd21280d81180f2c4ac27fd6c94d868f..e84a23c52a53095a077ed21bf4d1ddbad303442d 100644
index 7e85ad7ba31bbb32ea1e1dff5d1c83e7ce68b4b3..3ccf5083333751ee1eede1d3e1a28b6f7bf7f23c 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Slime.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Slime.java
@@ -64,18 +64,55 @@ public class Slime extends Mob implements Enemy {

4
patches/server/0027-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/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 31fe4b148ded17e6a76bae1dabee3850cc635208..ab262c53bd45c4ca2d2942aee20cfbac1b313678 100644
index d3624f5a4e3ab9f09d1588a648acba6920e95cfc..f9df95b189318f08c42bb120c4fa815fc47683ac 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -774,9 +774,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -777,9 +777,15 @@ public class ServerLevel extends Level implements WorldGenLevel {
boolean flag1 = this.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01D) && !this.getBlockState(blockposition.below()).is(Blocks.LIGHTNING_ROD); // Paper
if (flag1) {

6
patches/server/0095-Allow-toggling-special-MobSpawners-per-world.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Allow toggling special MobSpawners per world
In vanilla, these are all hardcoded on for world type 0 (overworld) and hardcoded off for every other world type. Default config behaviour matches this.
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index d546494c212cef210662ff8f6bc6ec2aae11ed27..96acb6ef2ea31395f666e40c86eb7a4c61f7353c 100644
index f9df95b189318f08c42bb120c4fa815fc47683ac..31368f0747e1e63d9b2f66db69dacc3af05d41a5 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -504,7 +504,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -505,7 +505,24 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.dragonParts = new Int2ObjectOpenHashMap();
this.tickTime = flag1;
this.server = minecraftserver;
@@ -36,7 +36,7 @@ index d546494c212cef210662ff8f6bc6ec2aae11ed27..96acb6ef2ea31395f666e40c86eb7a4c
ChunkGenerator chunkgenerator = worlddimension.generator();
// CraftBukkit start
diff --git a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
index 4ee71a58aff50caf5bd715a4cbe50b134b52c9ff..7cbd1f1409c1b071007629cd349c1d928aad4887 100644
index daa7c4bd8a3f6c28f02b7117b061f0def29e3743..d4699d7eefafffd2d4e0a03d62d5094f001bbcae 100644
--- a/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
+++ b/src/main/java/net/minecraft/world/entity/npc/WanderingTraderSpawner.java
@@ -4,6 +4,7 @@ import java.util.Iterator;

10
patches/server/0102-Configurable-daylight-cycle.patch
View File

@@ -31,10 +31,10 @@ index 863cb20d9f67f9399dc0bd5c5f7cd955519f7e1d..f1198c07e479954a1be1e9fe52329a66
}
ServerPlayer entityplayer = (ServerPlayer) entityhuman;
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13d0ee5444 100644
index 31368f0747e1e63d9b2f66db69dacc3af05d41a5..f20a904362fbbf1e6ff4ace1af78cece87f9f431 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -209,6 +209,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -210,6 +210,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
private final StructureManager structureManager;
private final StructureCheck structureCheck;
private final boolean tickTime;
@@ -43,7 +43,7 @@ index 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13
public long lastMidTickExecuteFailure; // Paper - execute chunk tasks mid tick
// CraftBukkit start
@@ -581,6 +583,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -584,6 +586,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
this.asyncChunkTaskManager = new com.destroystokyo.paper.io.chunk.ChunkTaskManager(this); // Paper
@@ -51,7 +51,7 @@ index 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13
}
public void setWeatherParameters(int clearDuration, int rainDuration, boolean raining, boolean thundering) {
@@ -738,6 +741,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -741,6 +744,13 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.serverLevelData.setGameTime(i);
this.serverLevelData.getScheduledEvents().tick(this.server, i);
if (this.levelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -65,7 +65,7 @@ index 3dea01cdb2332817ea7185900bb178efa8ae0f73..7f0de91fa60f527c9396a67dde060c13
this.setDayTime(this.levelData.getDayTime() + 1L);
}
@@ -746,7 +756,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -749,7 +759,21 @@ public class ServerLevel extends Level implements WorldGenLevel {
public void setDayTime(long timeOfDay) {
this.serverLevelData.setDayTime(timeOfDay);

4
patches/server/0151-Config-for-skipping-night.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Config for skipping night
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 4369cc7a72a29acd6004b7f76d8d7ef94932ec76..bf61f916059ea38586ee9ddd9261f71494be8a3f 100644
index f20a904362fbbf1e6ff4ace1af78cece87f9f431..b2d2c63b02c00ebb5d85fe729fccf1acf11888a9 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -622,7 +622,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -625,7 +625,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
long j;

4
patches/server/0188-Make-lightning-rod-range-configurable.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Make lightning rod range configurable
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 4677fa4a7869dd2cb23228e17cbf11c273bc338f..14ebaab8ae3765ddcc56257ef5da657b8d4ef700 100644
index b2d2c63b02c00ebb5d85fe729fccf1acf11888a9..f83ed9b55bc079cf90e51b52aaf027f0adc53873 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -917,7 +917,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -920,7 +920,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
return holder.is(PoiTypes.LIGHTNING_ROD);
}, (blockposition1) -> {
return blockposition1.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockposition1.getX(), blockposition1.getZ()) - 1;

6
patches/server/0191-Add-permission-bypass-for-portal-waiting.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add permission bypass for portal waiting
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index f8c196dc452fb1f79c6a6c2dea479fc98870728e..64ab2ff61d5611574d11a32e7887e48e673a86c4 100644
index a4b46199099c654d6fb6373e0cf340dd69bd7bf8..1eb57eeaec24570cade410f40de9e8c244734217 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -188,6 +188,7 @@ public abstract class Player extends LivingEntity {
@@ -26,10 +26,10 @@ index f8c196dc452fb1f79c6a6c2dea479fc98870728e..64ab2ff61d5611574d11a32e7887e48e
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
index 83c5314ed3a3f09162bca47902c4e749fab940a0..baec08d7d23bb71e0978f790b2e07ffab93d1c79 100644
index 73517e2cc98e9cda6e577976232a6c9314226ece..85ae4f2317a6fa68fcec42cb2a7ff68f9b901a0c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -245,6 +245,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -246,6 +246,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@Override
public void recalculatePermissions() {
this.perm.recalculatePermissions();

4
patches/server/0203-Customizable-sleeping-actionbar-messages.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Customizable sleeping actionbar messages
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 14ebaab8ae3765ddcc56257ef5da657b8d4ef700..a8840bccc147237f74780f44241544b87d59ae8f 100644
index f83ed9b55bc079cf90e51b52aaf027f0adc53873..dfff5fd35838987dab4d971731a093721f683073 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -966,11 +966,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -969,11 +969,27 @@ public class ServerLevel extends Level implements WorldGenLevel {
if (this.canSleepThroughNights()) {
if (!this.getServer().isSingleplayer() || this.getServer().isPublished()) {
int i = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);

4
patches/server/0222-Extended-OfflinePlayer-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Extended OfflinePlayer API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
index 50927403d07954f3b930b39046866899a1b289e6..c544e411934832cabb230047632454fff0460eef 100644
index 6d2ba650f53de8a460857f1846401a20b50cc43c..8ed695fd64feb3c2411ed46d9c326eb20e0a321c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
@@ -538,4 +538,213 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -549,4 +549,213 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
manager.save();
}
}

6
patches/server/0224-Option-for-if-rain-and-thunder-should-stop-on-sleep.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Option for if rain and thunder should stop on sleep
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index a8840bccc147237f74780f44241544b87d59ae8f..974b7bb2cd2f8186a6d1bf73e48fdd52f4e0348d 100644
index dfff5fd35838987dab4d971731a093721f683073..f6416542dc491c8852a86e76c9300419ff6a0106 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -1125,6 +1125,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1128,6 +1128,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
private void resetWeatherCycle() {
// CraftBukkit start
@@ -16,7 +16,7 @@ index a8840bccc147237f74780f44241544b87d59ae8f..974b7bb2cd2f8186a6d1bf73e48fdd52
this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - when passing the night
// If we stop due to everyone sleeping we should reset the weather duration to some other random value.
// Not that everyone ever manages to get the whole server to sleep at the same time....
@@ -1132,6 +1133,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -1135,6 +1136,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
this.serverLevelData.setRainTime(0);
}
// CraftBukkit end

4
patches/server/0253-Allow-void-trading.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 974b7bb2cd2f8186a6d1bf73e48fdd52f4e0348d..3586ca6e42ca710a56046ca067d9d6423945d8b0 100644
index f6416542dc491c8852a86e76c9300419ff6a0106..063ccc22bb1b249ec93442784ac4ecf7d156a271 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2663,7 +2663,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2666,7 +2666,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
// Paper start