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@b097a24 Expose isUnderWater to Entity (#8454)
PaperMC/Paper@6b26cfc Add missing Entity + Projectile API (#7632)
PaperMC/Paper@de2d2d4 Add PlayerInventorySlotChangeEvent (#7321)
PaperMC/Paper@f7c8d79 Fix stacktrace in server tests
PaperMC/Paper@b9cf1ac Fix a classloading issue in tests (#8459)
PaperMC/Paper@7fe34e9 Make CraftMinecartTNT public
PaperMC/Paper@514a606 Elder Guardian appearance API (#8455)
PaperMC/Paper@2094011 Update settings directory path in exceptions (#7968)
PaperMC/Paper@0bdf997 Avoid cycle deprecation (#8466)
PaperMC/Paper@eb68bd4 Allow changing bed's 'occupied' property (#8458)
This commit is contained in:
BillyGalbreath
2022-10-15 12:51:22 -05:00
parent 3454e6a047
commit 50687db565
47 changed files with 196 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0155-Drowning-Settings.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index e801f801b4ca511158be678448a1d0ba03810b5d..8304890f8e4ffb9c98e7e3d22aed30a706eedfba 100644
index 6a914c3185bac2f3cce6c45d98012ed53fbdab24..c3be1e6d54862dc7e1615e4fe3771b8f38e44f8a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3129,7 +3129,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3128,7 +3128,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public int getMaxAirSupply() {
@@ -18,7 +18,7 @@ index e801f801b4ca511158be678448a1d0ba03810b5d..8304890f8e4ffb9c98e7e3d22aed30a7
public int getAirSupply() {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 5e063e52a580d311227d08a6ed4ba996d5393b56..a7f3781e73db0bffe7acdd678f436a14dc5898a2 100644
index c5f0c5ce4e20670fe2a61e4775e01094a0d36ed6..0c830930522c38a7baf689beebf65970e96c3461 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -423,7 +423,7 @@ public abstract class LivingEntity extends Entity {