OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix-portal-create-event' of https://github.com/prplz/Paper into pre/1.13

Browse source
This commit is contained in:
Shane Freeder 2018-07-31 15:07:41 +01:00
commit a8c3640efd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Spigot-Server-Patches/Call-PortalCreateEvent-for-exit-portals.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Call PortalCreateEvent for exit portals
diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index 402d8d7d63..f363734500 100644
index 402d8d7d..cd8b4b4a 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -0,0 +0,0 @@ package net.minecraft.server;
@ -16,6 +16,7 @@ index 402d8d7d63..f363734500 100644
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Random;
// CraftBukkit start
@ -72,7 +73,7 @@ index 402d8d7d63..f363734500 100644
}
+ Collection<Block> bukkitBlocks = new HashSet<>(); // Paper
+ Map<BlockPosition, IBlockData> nmsBlocks = new HashMap<>(); // Paper
+ Map<BlockPosition, IBlockData> nmsBlocks = new LinkedHashMap<>(); // Paper
+
if (d0 < 0.0D) {
i1 = MathHelper.clamp(i1, 70, this.world.aa() - 10);