mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 12:41:50 +01:00
4e958e229f
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com> Co-authored-by: zml <zml@stellardrift.ca> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
27 lines
1.2 KiB
Diff
27 lines
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 5550fd9ea6bcae07dcdf431322cb0da0b26a6d71..e0118a971e1ea3c52a1380f519146b8f46a425ea 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
@@ -63,9 +63,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();
|