mirror/Paper
2
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-18 14:24:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Bleeding] Add all blocks needed to PortalCreateEvent. Fixes BUKKIT-5464

Browse Source 
Due to changes in how portals were created in Minecraft 1.7, the code that
was previously used to find the blocks involved in the PortalCreateEvent
no longer detected all blocks. Additionally, in the process of updating to
1.7.2, a missed diff resulted in some blocks that were found not being
properly added to the blocklist. This commit corrects that missed diff,
while also adding a check to ensure that the top and bottom of the portal
frame are included in the blocklist.
This commit is contained in:
GJ 2014-03-20 12:59:10 -04:00 committed by Travis Watkins
parent 729df1a734
commit 81e560621f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/minecraft/server/PortalCreator.java
View File

@ -12,7 +12,7 @@ public class PortalCreator {
private ChunkCoordinates f;
private int g;
private int h;
java.util.Collection<org.bukkit.block.Block> blocks; // CraftBukkit - add field
java.util.Collection<org.bukkit.block.Block> blocks = new java.util.HashSet<org.bukkit.block.Block>(); // CraftBukkit - add field
public PortalCreator(World world, int i, int j, int k, int l) {
this.a = world;
@ -65,8 +65,10 @@ public class PortalCreator {
}
protected int a() {
this.blocks = new java.util.HashSet<org.bukkit.block.Block>(); // CraftBukkit
// CraftBukkit start
this.blocks.clear();
org.bukkit.World bworld = this.a.getWorld();
// CraftBukkit end
int i;
int j;
int k;
@ -118,6 +120,10 @@ public class PortalCreator {
if (this.a.getType(j, k, l) != Blocks.OBSIDIAN) {
this.g = 0;
break;
// CraftBukkit start - add the block to our list
} else {
blocks.add(bworld.getBlockAt(j, k, l));
// CraftBukkit end
}
}
@ -151,7 +157,7 @@ public class PortalCreator {
for (int l = 0; l < this.g; ++l) {
int i1 = this.f.y + l;
bworld.getBlockAt(j, i1, k);
blocks.add(bworld.getBlockAt(j, i1, k));
}
}