mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
8ec7d99ec0
Upstream has released updates that appears to apply and compile correctly Paper Changes: a6ac47e5 Fix numerous item duplication issues and teleport issues b7402f11 Add phantom creative and insomniac controls (#3222) 75819fac Fix Potion#toItemStack swapping the extended and upgraded constructor values (#3216)
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From cd72595fb41e924ab2d4622bf5d7f6cf08725dc2 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 21 Mar 2020 18:33:05 -0500
|
|
Subject: [PATCH] End gateway should check if entity can use portal
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/TileEntityEndGateway.java | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
index c71f76004..d73045f70 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
@@ -118,6 +118,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
|
|
|
|
public void a(Entity entity) {
|
|
if (this.world instanceof WorldServer && !this.f()) {
|
|
+ if (!entity.canPortal()) return; // Purpur
|
|
this.c = 100;
|
|
if (this.exitPortal == null && this.world.worldProvider instanceof WorldProviderTheEnd) {
|
|
this.a((WorldServer) this.world);
|
|
--
|
|
2.24.0
|
|
|