Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Tuinity & Airplane)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Tuinity Changes:
f7c42491a Fix dangerous end portal logic

Airplane Changes:
8c5012517 Switch bitset to long storage
617dfe27a Patch Paper to use fast item merge raytracing
16104e8a0 Update Upstream (Tuinity)
This commit is contained in:
BillyGalbreath
2021-06-01 19:45:44 -05:00
parent d2204a3dac
commit ff09f9e62d
26 changed files with 1250 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0106-Entities-can-use-portals-configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 668f613a901523e87780f33ffff565d965521783..7bab5b730486b1f22246c39d581c69a43f85a984 100644
index 7856e81266c9b63eebeb7b302e64c1c697841aae..90b8e9d7fb97b410cb4b7b555033ce3f14acba78 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2553,7 +2553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -2585,7 +2585,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
public void d(BlockPosition blockposition) {
if (this.ai()) {
this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 668f613a901523e87780f33ffff565d965521783..7bab5b730486b1f22246c39d581c69a4
if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
this.ac = blockposition.immutableCopy();
}
@@ -3133,7 +3133,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -3166,7 +3166,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
}
public boolean canPortal() {