mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
5c7cdad371
Upstream has released updates that appears to apply and compile correctly Paper Changes: fcbeac8a [CI-SKIP] Readme update (#3702) 824f8086 Bandaid italic legacy serialization #3757 (#3760) Tuinity Changes: 9f21359: Re-add optimise collision checking in player move packet handling 1152054: Revert player move packet optimisation ef0a6c4: Optimise collision checking in player move packets
19 lines
970 B
Diff
19 lines
970 B
Diff
From 0000000000000000000000000000000000000000 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
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
index ce239d2b2..d00ca8a53 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
|
|
@@ -122,6 +122,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.getDimensionKey() == World.THE_END) {
|
|
this.a((WorldServer) this.world);
|