geforkt von Mirrors/Paper
b31089a929
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: d264e972 #591: Add option for a consumer before spawning an item 1c537fce #590: Add spawn and transform reasons for piglin zombification. CraftBukkit Changes: ee5006d1 #810: Add option for a consumer before spawning an item f6a39d3c #809: Add spawn and transform reasons for piglin zombification. 0c24068a Organise imports Spigot Changes: bff52619 Organise imports
28 Zeilen
1.2 KiB
Diff
28 Zeilen
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: kickash32 <kickash32@gmail.com>
|
|
Date: Fri, 15 May 2020 01:10:03 -0400
|
|
Subject: [PATCH] Ensure safe gateway teleport
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
index a242dd1f7ca7f2d93312d630173397a3abd83b1d..b740c9b66a77df1ff20fba794c49a1de4292ba88 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
@@ -64,9 +64,14 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
|
|
} else if (!this.world.isClientSide) {
|
|
List<Entity> list = this.world.a(Entity.class, new AxisAlignedBB(this.getPosition()), TileEntityEndGateway::a);
|
|
|
|
- if (!list.isEmpty()) {
|
|
- this.b((Entity) list.get(this.world.random.nextInt(list.size())));
|
|
+ // Paper start
|
|
+ for (Entity entity : list) {
|
|
+ if (entity.canPortal()) {
|
|
+ this.b(entity);
|
|
+ break;
|
|
+ }
|
|
}
|
|
+ // Paper end
|
|
|
|
if (this.age % 2400L == 0L) {
|
|
this.h();
|