Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@e552beb Fix inventory desync (#9640)
PaperMC/Paper@6f30f08 Readd old BlockDamageEvent constructor
PaperMC/Paper@6813244 Fix/improve destroy speed API (#9645)
PaperMC/Paper@7d13b70 Add titleOverride to InventoryOpenEvent (#7540)
PaperMC/Paper@0e622c7 Add sniffer egg api (#9288)
PaperMC/Paper@0c0a480 Do crystal-portal proximity check before entity lookup (#9611)

Pufferfish Changes:
pufferfish-gg/Pufferfish@30537a0 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@af1f56c Updated Upstream (Paper)
pufferfish-gg/Pufferfish@f6a081a Updated Upstream (Paper)
pufferfish-gg/Pufferfish@e148cd6 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2611af8 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@68f7501 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@38b9f2e Updated Upstream (Paper)
pufferfish-gg/Pufferfish@2bc9d45 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@a3c0a4d Updated Upstream (Paper)
This commit is contained in:
granny
2023-08-26 22:05:21 -07:00
parent 8ef1580b1f
commit 4240de4a38
14 changed files with 59 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0278-Implement-ram-and-rambar-commands.patch
View File

@@ -18,7 +18,7 @@ index 52b06c34d9d3ffb8844556e7b0eaed5a7f03da0c..5c0085589b08f199c75ceeab8d0cf25e
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4942f4b1a54f6583a9d627a0b0513d36c6f81a7a..9c729910a39b010bf2123517c0bffc5a8993e6d1 100644
index 2f013c3365d065325d645d43f7c5137f942b06df..0249eeb3937cf48cea13846a7e39b248947e21a4 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -280,6 +280,7 @@ public class ServerPlayer extends Player {
@@ -45,7 +45,7 @@ index 4942f4b1a54f6583a9d627a0b0513d36c6f81a7a..9c729910a39b010bf2123517c0bffc5a
nbt.putBoolean("Purpur.TPSBar", this.tpsBar); // Purpur
nbt.putBoolean("Purpur.CompassBar", this.compassBar); // Purpur
}
@@ -2815,6 +2818,14 @@ public class ServerPlayer extends Player {
@@ -2816,6 +2819,14 @@ public class ServerPlayer extends Player {
}
}
@@ -61,7 +61,7 @@ index 4942f4b1a54f6583a9d627a0b0513d36c6f81a7a..9c729910a39b010bf2123517c0bffc5a
return this.tpsBar;
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 6191efac8add7d45747036e07c7e895a70f6ff7b..77d927a28eb01aae3a49be3e7b7a5fe219b7739d 100644
index ed9b2f0b55229848894d9d6b401d050cb031b893..568bb53e91dda4804cd328a81ba12ce735c52603 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -182,6 +182,8 @@ public class PurpurConfig {