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@f7a1344 Improve PortalEvents (#8679)
PaperMC/Paper@e498dda Add missing EntityChangeBlockEvent (#8696)
This commit is contained in:
BillyGalbreath
2022-12-18 15:46:43 -06:00
parent 07afb7204e
commit 278eebff54
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1919,7 +1919,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 7f94da8059147760cbdc2476d0e8beda4a105f40..caa4d38d620717e78df9ad29fe9752213f1cda1b 100644
index be54a70b47433c2abaeb8632ffe55d0762f619d6..374b46c344ca868cab7c47be69cb005eb90319e8 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -291,7 +291,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2005,7 +2005,7 @@ index 7f94da8059147760cbdc2476d0e8beda4a105f40..caa4d38d620717e78df9ad29fe975221
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;
@@ -4075,16 +4109,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4082,16 +4116,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2031,7 +2031,7 @@ index 7f94da8059147760cbdc2476d0e8beda4a105f40..caa4d38d620717e78df9ad29fe975221
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4092,14 +4128,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4099,14 +4135,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2099,7 +2099,7 @@ index 7f94da8059147760cbdc2476d0e8beda4a105f40..caa4d38d620717e78df9ad29fe975221
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4121,9 +4204,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4128,9 +4211,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}