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@aab1f8a Fix swamp hut cat generation deadlock
PaperMC/Paper@dc96bba Ensure the item sent isn't air (#7584)
PaperMC/Paper@bfa33d9 Various improvements to console color formatting (#7560)
PaperMC/Paper@87927e1 Fix CreativeCategory API (#7586)
PaperMC/Paper@ab03538 Fix colors in some console messages
PaperMC/Paper@1358d1e Updated Upstream (CraftBukkit/Spigot) (#7580)
This commit is contained in:
BillyGalbreath
2022-03-13 14:24:00 -05:00
parent 67f934ef19
commit 36cc6584f3
24 changed files with 86 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,10 +22,10 @@ index 8c79f66abd42e9c9875e8877c6dd82b5e3cfa184..2841469748bc308f690aaeb34fe05cb2
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 532a658a37a49c05734903449878ddbea7ed980f..dde15e73d1967d99bc626ba2e5d2e1d4194378e7 100644
index a6f29c00d6716b501d0f52db8670d81e1304b7c0..1b3784eaac409c86806b6deeffcb08484e5f96d9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1577,6 +1577,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1573,6 +1573,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
ServerLevel worldserver = (ServerLevel) iterator.next();
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -34,7 +34,7 @@ index 532a658a37a49c05734903449878ddbea7ed980f..dde15e73d1967d99bc626ba2e5d2e1d4
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 48e428ce0590c530522de56c9f9c8cf1631c6e01..e0bf9bd1088dd4d126a62bf96a0e9c37d2dc7116 100644
index af063e08d33b15892079331e8bff86a9a8108630..024b3519b9610655774559f08558b7170d025c35 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -212,6 +212,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -79,7 +79,7 @@ index 353848667006bc386fe5d3fceb61ac58be20a941..d61e30e19c1144a3610f92028c047e0f
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((LivingEntity) entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 3522b7b81eae07ac010c5f9fd056210ff80d5b7d..a798d5ea72bc06395e27199c57be86b407311e50 100644
index 8e7d8482f44799d2df6ebea380dc4ff47fd66c3d..b630e2a4decc750474f4c9dc6669ecb420a9ceaf 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -300,7 +300,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -813,7 +813,7 @@ index b07fa7fba33b76ae7054dc95b583a3c7a381c5ab..08f2920dad7a10270f25dd8a2144e981
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Cat.java b/src/main/java/net/minecraft/world/entity/animal/Cat.java
index 5f7c394f9cc178c9cb06c90b91296b979d61239b..60487cc84c3b4ce0b7e343895da0325c95b10c64 100644
index e4eac546836b73b5e9c8fd68ca0d32c01148313e..8ff83309964280e09c36c32d45c7e05e9af5abf1 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Cat.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Cat.java
@@ -124,6 +124,31 @@ public class Cat extends TamableAnimal {
@@ -3216,7 +3216,7 @@ index ee9194ffb3cc6d660d4f99a3914ede7e4a3643fe..7e79fe61e4fd0d26f62a0515c437370c
return Guardian.createAttributes().add(Attributes.MOVEMENT_SPEED, 0.30000001192092896D).add(Attributes.ATTACK_DAMAGE, 8.0D).add(Attributes.MAX_HEALTH, 80.0D);
}
diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
index 987b7d1924a9caa710fc350012533e56a378646b..e1d6996944a48d55b3ad5125ab6790e22c905024 100644
index 1d9c542f3fe7da7bb9ea8b13496651a7b3dcde07..5117838e37730f81f8089d467e861adc3edd2829 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
@@ -87,9 +87,27 @@ public class EnderMan extends Monster implements NeutralMob {
@@ -4863,7 +4863,7 @@ index 86e1ba898d6b92735258419fa74352e5116226dc..2ae9a5da91ad20f1b566a686dcc8d4f1
this.setTradingPlayer(player);
this.openTradingScreen(player, this.getDisplayName(), 1);
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 9c767096ca950d55d6002282c7a3fe2884bcd630..54b0e70dc8d89ebcad345b414c759d70d47dd4a2 100644
index 2483d7df7f1bf94344afd38b37602c645a4a2dff..41b1468d3c5f3c4ed11fe1eeb742a7f3826955c7 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -192,6 +192,19 @@ public abstract class Player extends LivingEntity {