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@408a905 Don't put entities removed during the portal exit event into an invalid state
This commit is contained in:
granny
2023-08-08 03:43:36 -07:00
parent 98f10775ac
commit 41ab912b5b
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1935,7 +1935,7 @@ index 04b1531572e8fff1e46fe1c94e7fc863841e0f66..47ddc42f2b63d9d3fae5ae6ea93d4183
int LARGE_MAX_STACK_SIZE = 64;
int DEFAULT_DISTANCE_LIMIT = 8;
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc781596801f8a 100644
index 2edab21bb271405f200de5a19e9c748bb14aba7d..886c01e4df3c6d301d4603e6c097fe55fdfbae75 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -306,7 +306,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2021,7 +2021,7 @@ index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc7815
this.baseTick();
}
@@ -4288,16 +4322,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4293,16 +4327,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -2047,7 +2047,7 @@ index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc7815
double d1 = 0.0D;
boolean flag = this.isPushedByFluid();
boolean flag1 = false;
@@ -4305,14 +4341,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4310,14 +4346,61 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
int k1 = 0;
BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
@@ -2115,7 +2115,7 @@ index f189629f03503fc06b790729bd407b663a48e0db..02722358edf416e958e9181b2ecc7815
if (d2 >= axisalignedbb.minY) {
flag1 = true;
@@ -4334,9 +4417,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4339,9 +4422,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
// CraftBukkit end
}
}