OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 03:32:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Re-add GH-1286 fix for portals

Browse source 
Accidentally removed in 5311679c74

Also added to End Portals
This commit is contained in:
Zach Brown 2018-07-31 15:16:12 -05:00
parent 6ea611dc68
commit e8eb4bfee5
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,11 @@
From 45e58212dd6edf171819c56157f7fb32fa3ad617 Mon Sep 17 00:00:00 2001 From aede0a63093907f88b869b485c595bf1c8cb1efe Mon Sep 17 00:00:00 2001
From: MiniDigger <admin@minidigger.me> From: MiniDigger <admin@minidigger.me>
Date: Sun, 18 Mar 2018 15:44:44 +0100 Date: Sun, 18 Mar 2018 15:44:44 +0100
Subject: [PATCH] Call PortalCreateEvent for exit portals 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
@@ -12,7 +12,7 @@ import org.bukkit.util.Vector; @@ -12,7 +12,7 @@ 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);