mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@92f872c Fix bad diff in wandering trader spawn rate patch from .4 update PaperMC/Paper@9087a64 chore: cleanup annotations in api adventure patch PaperMC/Paper@23b0ef5 [ci skip] rebuild patches PaperMC/Paper@a0f548f Don't warn for deprecated PrepareGrindstoneEvent (#9036) PaperMC/Paper@38be4f8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9018) PaperMC/Paper@d5abb94 Expose Path to jar file in PluginProviderContext (#9030)
This commit is contained in:
@@ -5,7 +5,7 @@ Subject: [PATCH] Component related conveniences
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
index 98d92f6d6a98d66e369286b079db2c4db0bd5298..d5369a39c86353bd99b4b404028db2aea97f8438 100644
|
||||
index 4b2806b26ad712eb893b8b9702cf185792354435..1b3a4928aba578b402e4364aa6501b5445e0669f 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||||
@@ -1716,6 +1716,26 @@ public class ServerPlayer extends Player {
|
||||
@@ -81,10 +81,10 @@ index 93a1e990b0a6caae4143c2f9d09bfb368fa1d6db..615611fe372d6edaef56db058bbf2cf7
|
||||
return this.type().msgId();
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 6e8a76d64418c214fcdd021f23bdfaf9827470a9..a0aeb144f4f92b0cfdee1449b44771d0b6808d35 100644
|
||||
index 548133e399b5abc4aa83045af87c135a3455b722..9608b00d957bbd0158a22f61949e9029340be9c9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -3908,6 +3908,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
@@ -3914,6 +3914,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
return SlotAccess.NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user