twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Re-add GH-1286 fix for portals

Browse Source 
Accidentally removed in 897d804c62

Also added to End Portals
This commit is contained in:
Zach Brown
2018-07-31 15:16:12 -05:00
parent 87cbe8e40c
commit 1e737abf13
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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 diff --git a/src/main/java/net/minecraft/server/PortalTravelAgent.java b/src/main/java/net/minecraft/server/PortalTravelAgent.java
index 402d8d7d63..8ef31e72a5 100644 index 402d8d7d6..ba8d15431 100644
--- a/src/main/java/net/minecraft/server/PortalTravelAgent.java --- a/src/main/java/net/minecraft/server/PortalTravelAgent.java
+++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java +++ b/src/main/java/net/minecraft/server/PortalTravelAgent.java
@@ -0,0 +0,0 @@ import org.bukkit.util.Vector; @@ -0,0 +0,0 @@ import org.bukkit.util.Vector;
@@ -22,7 +22,7 @@ index 402d8d7d63..8ef31e72a5 100644
byte b1 = 0; byte b1 = 0;
+ java.util.Collection<org.bukkit.block.Block> bukkitBlocks = new java.util.HashSet<>(); // Paper + java.util.Collection<org.bukkit.block.Block> bukkitBlocks = new java.util.HashSet<>(); // Paper
+ java.util.Map<BlockPosition, IBlockData> nmsBlocks = new java.util.HashMap<>(); // Paper + java.util.Map<BlockPosition, IBlockData> nmsBlocks = new java.util.LinkedHashMap<>(); // Paper
+ +
for (int l = -2; l <= 2; ++l) { for (int l = -2; l <= 2; ++l) {
for (int i1 = -2; i1 <= 2; ++i1) { for (int i1 = -2; i1 <= 2; ++i1) {
@@ -56,7 +56,7 @@ index 402d8d7d63..8ef31e72a5 100644
} }
+ java.util.Collection<org.bukkit.block.Block> bukkitBlocks = new java.util.HashSet<>(); // Paper + java.util.Collection<org.bukkit.block.Block> bukkitBlocks = new java.util.HashSet<>(); // Paper
+ java.util.Map<BlockPosition, IBlockData> nmsBlocks = new java.util.HashMap<>(); // Paper + java.util.Map<BlockPosition, IBlockData> nmsBlocks = new java.util.LinkedHashMap<>(); // Paper
+ +
if (d0 < 0.0D) { if (d0 < 0.0D) {
i1 = MathHelper.clamp(i1, 70, this.world.aa() - 10); i1 = MathHelper.clamp(i1, 70, this.world.aa() - 10);