Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 19:46:21 +01:00
Code Issues Projects Releases Wiki Activity

Portals created by fire now trigger PortalCreateEvent.

Browse Source
This commit is contained in:
Rigby 2011-06-23 23:48:54 +01:00 committed by EvilSeph
parent b94bb27663
commit a5dd42adb9
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/minecraft/server/BlockPortal.java
View File

@ -3,10 +3,12 @@ package net.minecraft.server;
import java.util.Random; import java.util.Random;
// CraftBukkit start // CraftBukkit start
import java.util.ArrayList;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.event.entity.EntityPortalEnterEvent; import org.bukkit.event.entity.EntityPortalEnterEvent;
import org.bukkit.event.world.PortalCreateEvent;
// CraftBukkit end // CraftBukkit end
public class BlockPortal extends BlockBreakable { public class BlockPortal extends BlockBreakable {
@ -57,6 +59,11 @@ public class BlockPortal extends BlockBreakable {
if (b0 == b1) { if (b0 == b1) {
return false; return false;
} else { } else {
// CraftBukkit start
java.util.ArrayList<org.bukkit.block.Block> blocks = new ArrayList<org.bukkit.block.Block>();
CraftWorld craftWorld = world.getWorld();
// CraftBukkit end
if (world.getTypeId(i - b0, j, k - b1) == 0) { if (world.getTypeId(i - b0, j, k - b1) == 0) {
i -= b0; i -= b0;
k -= b1; k -= b1;
@ -75,6 +82,13 @@ public class BlockPortal extends BlockBreakable {
if (flag) { if (flag) {
if (j1 != Block.OBSIDIAN.id) { if (j1 != Block.OBSIDIAN.id) {
return false; return false;
} else {
// CraftBukkit start
org.bukkit.block.Block b = craftWorld.getBlockAt(i + b0 * l, j + i1, k + b1 * l);
if (!blocks.contains(b)) {
blocks.add(b);
}
// CraftBukkit end
} }
} else if (j1 != 0 && j1 != Block.FIRE.id) { } else if (j1 != 0 && j1 != Block.FIRE.id) {
return false; return false;
@ -83,6 +97,23 @@ public class BlockPortal extends BlockBreakable {
} }
} }
// CraftBukkit start
for (l = 0; l < 2; ++l) {
for (i1 = 0; i1 < 3; ++i1) {
org.bukkit.block.Block b = craftWorld.getBlockAt(i + b0 * l, j + i1, k + b1 * l);
if (!blocks.contains(b)) {
blocks.add(b);
}
}
}
PortalCreateEvent event = new PortalCreateEvent(blocks, (org.bukkit.World) craftWorld);
Bukkit.getServer().getPluginManager().callEvent(event);
if (event.isCancelled()) {
return false;
}
// CraftBukkit end
world.o = true; world.o = true;
for (l = 0; l < 2; ++l) { for (l = 0; l < 2; ++l) {