Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@bcb4220 Correctly handle interactions with items on cooldown (#8008)
PaperMC/Paper@60c973e Exempt players in creative/spectator from nether ceiling damage (#8427)
PaperMC/Paper@77a50b9 Add Unmodifiable annotations to getDrops methods (#8440)
This commit is contained in:
BillyGalbreath
2022-10-08 18:20:48 -05:00
parent f5ae75874a
commit 28167fbd60
22 changed files with 62 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -1881,7 +1881,7 @@ index 540bc9500c35c0db719b00aa26f6fb3a1b08ed9f..806cb760822a99316b08ad95ff8922df
int LARGE_MAX_STACK_SIZE = 64;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb22500782af5 100644
index 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..568760d0824ecd7c46536479d94e3155900ce89a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -292,7 +292,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1966,7 +1966,7 @@ index 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb225
this.level.getProfiler().push("entityBaseTick");
if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Update last hurt when ticking
this.feetBlockState = null;
@@ -4016,16 +4049,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4017,16 +4050,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -1992,7 +1992,7 @@ index 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb225
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4033,14 +4068,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4034,14 +4069,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2060,7 +2060,7 @@ index 008bd65d838819431a0823c6ac5925774bd155a1..fc4bd8ad4836aa6bdd228885f0aeb225
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4062,9 +4144,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4063,9 +4145,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}