Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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

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 {