mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 11:42:55 +01:00
25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
|
From 8e93845e08efce37a5378c954743a983e142ff05 Mon Sep 17 00:00:00 2001
|
||
|
|
From: chickeneer <emcchickeneer@gmail.com>
|
||
|
|
Date: Mon, 7 Aug 2017 23:07:32 -0400
|
||
|
|
Subject: [PATCH] Fix Nether Portal Creation on cancelled event
|
||
|
|
|
||
|
|
Spigot is manipulating the Travel Agents canCreatePortal, but forgot to reset it on cancel
|
||
|
|
|
||
|
|
This causes nether portals to not be generated if the event is ever cancelled
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
index 34ac15d5e..190bda020 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -2371,6 +2371,7 @@ public abstract class Entity implements ICommandListener {
|
||
|
|
event.useTravelAgent(useTravelAgent);
|
||
|
|
event.getEntity().getServer().getPluginManager().callEvent(event);
|
||
|
|
if (event.isCancelled() || event.getTo() == null || event.getTo().getWorld() == null || !this.isAlive()) {
|
||
|
|
+ agent.setCanCreatePortal(oldCanCreate); // Paper
|
||
|
|
return null;
|
||
|
|
}
|
||
|
|
exit = event.useTravelAgent() ? event.getPortalTravelAgent().findOrCreate(event.getTo()) : event.getTo();
|
||
|
|
--
|
||
|
|
2.13.0
|
||
|
|
|