Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27: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@93b2246 Fix EntityCombustEvent cancellation issues (#8529)
PaperMC/Paper@4a9c9b3 Build updates
This commit is contained in:
BillyGalbreath
2022-10-31 21:40:00 -05:00
parent 0384c21235
commit cb121ecfd7
15 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0007-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 47d545a15b508454452699fe3e333b2bacc3159e..57c1ab010ff459dfb4e7d44e6afba36b56a19654 100644
index a56e79c852eaec4fbd7e428076323b01fda3463b..9091241c21715e2bbe43a11ba637ec7759e7a43a 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1709,6 +1709,26 @@ public class ServerPlayer extends Player {
@@ -36,7 +36,7 @@ index 47d545a15b508454452699fe3e333b2bacc3159e..57c1ab010ff459dfb4e7d44e6afba36b
public void displayClientMessage(Component message, boolean overlay) {
this.sendSystemMessage(message, overlay);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 06eda955f96b5fe2d08ed0d39229c7a6ebb88931..16154d89a1c67ebc9dc6ecaeb214799e75d16b6f 100644
index 3be9352ae9b0b84acf07064b45562ceffd30391b..550e53665ac3a8d1723e432f0cf0b4adbd03270f 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1074,6 +1074,20 @@ public abstract class PlayerList {
@@ -81,10 +81,10 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
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 d96422f871c18303ce7ff7a182c685b0ddbfa04d..4f1ed7708311d8a8d63706592e9feed8de2a4aa2 100644
index 26b42474a94ccabd8cfcca39e4c37fb14852cbb8..3971e5cf1fa98e8269c899f494a018042e83b69a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3797,6 +3797,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3801,6 +3801,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}