Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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@c389b1c Fix configs that relied on outdated min/max y levels (#6986)
PaperMC/Paper@57555b8 Add missing structure set seed configs (#8030)
This commit is contained in:
BillyGalbreath
2022-10-09 23:55:46 -05:00
parent c577b117e7
commit 38313f701e
15 changed files with 44 additions and 44 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 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..568760d0824ecd7c46536479d94e3155900ce89a 100644
index a80f4abf8a0c6c395f407c8bf25b44a64b0b9fe3..bf17305137f61455cc477515e054e6a65f976c45 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 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..568760d0824ecd7c46536479d94e3155
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;
@@ -4017,16 +4050,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4016,16 +4049,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -1992,7 +1992,7 @@ index 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..568760d0824ecd7c46536479d94e3155
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4034,14 +4069,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4033,14 +4068,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2060,7 +2060,7 @@ index 756b8e68c6b7c21c1ef78b68da9e41db4828c7c9..568760d0824ecd7c46536479d94e3155
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4063,9 +4145,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4062,9 +4144,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}