Update Upstream (Paper)

yadda yadda..

I haven't added a task to detect Paper's commits yet, and i dont feel like doing this manually.. so yeah. if you care, just look at paper's github history :P
This commit is contained in:
William Blake Galbreath
2021-06-22 09:52:42 -05:00
parent 5d69f6f5b5
commit b0bdfa48ac
13 changed files with 39 additions and 39 deletions

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 a2c060948f99739664f4c3c4657ca628378fa5c6..c443b850a512eae94d451521c5e9e0342aca2171 100644
index d774fd1c2f146b9933f7f1d4d4cdda1aeea5bf44..0f8cafed9afbb801217b2adb91c270811e149913 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2509,7 +2509,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -2512,7 +2512,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
public void handleInsidePortal(BlockPos pos) {
if (this.isOnPortalCooldown()) {
this.setPortalCooldown();
@@ -17,7 +17,7 @@ index a2c060948f99739664f4c3c4657ca628378fa5c6..c443b850a512eae94d451521c5e9e034
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
this.portalEntrancePos = pos.immutable();
}
@@ -3141,7 +3141,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3144,7 +3144,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
}
public boolean canChangeDimensions() {