Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
01334e7d #616: Fix exception on entity portal teleport attempt
This commit is contained in:
Shane Freeder
2020-01-14 21:43:50 +00:00
parent 1d5bd44d13
commit 0f795c3e8a
15 changed files with 62 additions and 151 deletions

View File

@@ -1,4 +1,4 @@
From 6c28f5412e55c6583fa0feea0fa218d2b488410c Mon Sep 17 00:00:00 2001
From e47da6c1ee139716e719de3284d8f25e87ac494e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 21 Jul 2018 14:27:34 -0400
Subject: [PATCH] Duplicate UUID Resolve Option
@@ -93,10 +93,10 @@ index c7c600b80..64c327669 100644
int k = MathHelper.floor(entity.locY() / 16.0D);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 88d7808b2..579ad1c43 100644
index 464301a1f..85f16bdb8 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2740,6 +2740,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2743,6 +2743,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
});
}