Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 02: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@18f0f8d Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@5928327 Remove unneeded patch (#7806)
PaperMC/Paper@9fd870d Fix cancelling PlayerItemFrameChangeEvent (#7761)
PaperMC/Paper@8d1de8d deprecate old MaterialData api (#7585)
PaperMC/Paper@0116751 List world on tile entity placement exception (#7709)
PaperMC/Paper@73bd35d Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@7045f18 Change link to screamingsandals
This commit is contained in:
Encode42
2022-05-18 12:06:06 -04:00
parent 259a9eec4a
commit 9e37478326
26 changed files with 131 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0005-Component-related-conveniences.patch
View File

@@ -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 2dcb24145bf07b186b853bd3e4c4be46495575d8..c2507dead89ea66ea8d2bf9081cbe30b7c4eb7dc 100644
index 46ddb309ee4296b9d3464e716b4b36ef8927261d..23ef3a12dcd184edeaad3f939d2a9cbffa7fd35e 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1698,6 +1698,26 @@ public class ServerPlayer extends Player {
@@ -123,10 +123,10 @@ index a828cad27fcd39f8bfbaefa97052a2a3b6650ee7..67e559d63c543ff716d610cb04ff9426
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4e6cbb858806cbf73dbf195bb436bbeff1a5b92a..de9d25ff83818ae0943fd0ed59512bef073a61a2 100644
index 3f032a510e741d52c4c7fc701df65c77c30362ed..bc46286007e5a6dd691dd51ec43f99fe5c974db8 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3682,6 +3682,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3676,6 +3676,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}