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)

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

Paper Changes:
PaperMC/Paper@c4782f5 Add xp orb spawn reason for frogs (#8045)
PaperMC/Paper@95ac874 Add ZombieVillager conversion without entity event (#8111)
PaperMC/Paper@41238a4 [ci skip] Fixed typo in README (#8031)
This commit is contained in:
BillyGalbreath
2022-07-07 23:47:02 -05:00
parent 4ffb3e0ce5
commit 93c82c9783
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0255-Configurable-player-pickup-exp-delay.patch
View File

@@ -9,10 +9,10 @@ players still only pick up one orb every tick. However, setting this
to any negative number will pick up all orbs instantly.
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
index 37fe86f0f6ea006f658cd6a68757c1c12ae32eb7..d6ee7b9d2fafbe76d4705a182ae1a0e98ce91eef 100644
index cbeea12009ec89fb3223e6a9545485a9bc19c21f..b10c792a4f743bdb8a10fe1693def562d161a879 100644
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
@@ -301,8 +301,8 @@ public class ExperienceOrb extends Entity {
@@ -303,8 +303,8 @@ public class ExperienceOrb extends Entity {
@Override
public void playerTouch(Player player) {
if (!this.level.isClientSide) {
@@ -37,7 +37,7 @@ index 870e794392b94d140db6d5650c3e7ae3dd6f593d..7344324517fb10ee6ab3467b40fcb9cd
} else if (!entity.isRemoved()) {
this.touch(entity);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index ab53d43d26e01cb7ea5725bbda8b0a8a708a086c..6f14dac3a428e8d982a172c5c510e424cf09ecf6 100644
index 62c2bd8988815b5afe54a26e328bf75a758ffab4..ce6744240e4e57aef9f5d452047f103068e37b91 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -416,6 +416,7 @@ public class PurpurWorldConfig {