139 Zeilen
5.9 KiB
Diff
139 Zeilen
5.9 KiB
Diff
--- a/net/minecraft/server/BlockPortal.java
|
|
+++ b/net/minecraft/server/BlockPortal.java
|
|
@@ -4,6 +4,12 @@
|
|
import java.util.Random;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.block.CraftBlock;
|
|
+import org.bukkit.event.entity.EntityPortalEnterEvent;
|
|
+import org.bukkit.event.world.PortalCreateEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public class BlockPortal extends Block {
|
|
|
|
public static final BlockStateEnum<EnumDirection.EnumAxis> AXIS = BlockProperties.y;
|
|
@@ -37,7 +43,8 @@
|
|
}
|
|
|
|
if (i > 0 && !world.getType(blockposition1.up()).isOccluding()) {
|
|
- Entity entity = EntityTypes.ZOMBIE_PIGMAN.a(world, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition1.up(), false, false);
|
|
+ // CraftBukkit - set spawn reason to NETHER_PORTAL
|
|
+ Entity entity = EntityTypes.ZOMBIE_PIGMAN.spawnCreature(world, (NBTTagCompound) null, (IChatBaseComponent) null, (EntityHuman) null, blockposition1.up(), false, false, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NETHER_PORTAL);
|
|
|
|
if (entity != null) {
|
|
entity.portalCooldown = entity.aQ();
|
|
@@ -55,8 +62,10 @@
|
|
BlockPortal.Shape blockportal_shape = this.b(generatoraccess, blockposition);
|
|
|
|
if (blockportal_shape != null) {
|
|
- blockportal_shape.createPortal();
|
|
- return true;
|
|
+ // CraftBukkit start - return portalcreator
|
|
+ return blockportal_shape.createPortal();
|
|
+ // return true;
|
|
+ // CraftBukkit end
|
|
} else {
|
|
return false;
|
|
}
|
|
@@ -93,6 +102,10 @@
|
|
|
|
public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Entity entity) {
|
|
if (!entity.isPassenger() && !entity.isVehicle() && entity.bm()) {
|
|
+ // CraftBukkit start - Entity in portal
|
|
+ EntityPortalEnterEvent event = new EntityPortalEnterEvent(entity.getBukkitEntity(), new org.bukkit.Location(world.getWorld(), blockposition.getX(), blockposition.getY(), blockposition.getZ()));
|
|
+ world.getServer().getPluginManager().callEvent(event);
|
|
+ // CraftBukkit end
|
|
entity.e(blockposition);
|
|
}
|
|
|
|
@@ -193,6 +206,7 @@
|
|
private BlockPosition position;
|
|
private int height;
|
|
private int width;
|
|
+ java.util.Collection<org.bukkit.block.Block> blocks = new java.util.HashSet<org.bukkit.block.Block>(); // CraftBukkit - add field
|
|
|
|
public Shape(GeneratorAccess generatoraccess, BlockPosition blockposition, EnumDirection.EnumAxis enumdirection_enumaxis) {
|
|
this.a = generatoraccess;
|
|
@@ -251,6 +265,9 @@
|
|
}
|
|
|
|
protected int c() {
|
|
+ // CraftBukkit start
|
|
+ this.blocks.clear();
|
|
+ // CraftBukkit end
|
|
int i;
|
|
|
|
label56:
|
|
@@ -273,11 +290,21 @@
|
|
block = this.a.getType(blockposition.shift(this.d)).getBlock();
|
|
if (block != Blocks.OBSIDIAN) {
|
|
break label56;
|
|
+ // CraftBukkit start - add the block to our list
|
|
+ } else {
|
|
+ BlockPosition pos = blockposition.shift(this.d);
|
|
+ blocks.add(CraftBlock.at(this.a, pos));
|
|
+ // CraftBukkit end
|
|
}
|
|
} else if (i == this.width - 1) {
|
|
block = this.a.getType(blockposition.shift(this.c)).getBlock();
|
|
if (block != Blocks.OBSIDIAN) {
|
|
break label56;
|
|
+ // CraftBukkit start - add the block to our list
|
|
+ } else {
|
|
+ BlockPosition pos = blockposition.shift(this.c);
|
|
+ blocks.add(CraftBlock.at(this.a, pos));
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
}
|
|
@@ -287,6 +314,11 @@
|
|
if (this.a.getType(this.position.shift(this.c, i).up(this.height)).getBlock() != Blocks.OBSIDIAN) {
|
|
this.height = 0;
|
|
break;
|
|
+ // CraftBukkit start - add the block to our list
|
|
+ } else {
|
|
+ BlockPosition pos = this.position.shift(this.c, i).up(this.height);
|
|
+ blocks.add(CraftBlock.at(this.a, pos));
|
|
+ // CraftBukkit end
|
|
}
|
|
}
|
|
|
|
@@ -310,7 +342,27 @@
|
|
return this.position != null && this.width >= 2 && this.width <= 21 && this.height >= 3 && this.height <= 21;
|
|
}
|
|
|
|
- public void createPortal() {
|
|
+ // CraftBukkit start - return boolean
|
|
+ public boolean createPortal() {
|
|
+ org.bukkit.World bworld = this.a.getMinecraftWorld().getWorld();
|
|
+
|
|
+ // Copy below for loop
|
|
+ for (int i = 0; i < this.width; ++i) {
|
|
+ BlockPosition blockposition = this.position.shift(this.c, i);
|
|
+
|
|
+ for (int j = 0; j < this.height; ++j) {
|
|
+ BlockPosition pos = blockposition.up(j);
|
|
+ blocks.add(bworld.getBlockAt(pos.getX(), pos.getY(), pos.getZ()));
|
|
+ }
|
|
+ }
|
|
+
|
|
+ PortalCreateEvent event = new PortalCreateEvent(blocks, bworld, PortalCreateEvent.CreateReason.FIRE);
|
|
+ this.a.getMinecraftWorld().getMinecraftServer().server.getPluginManager().callEvent(event);
|
|
+
|
|
+ if (event.isCancelled()) {
|
|
+ return false;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
for (int i = 0; i < this.width; ++i) {
|
|
BlockPosition blockposition = this.position.shift(this.c, i);
|
|
|
|
@@ -319,6 +371,7 @@
|
|
}
|
|
}
|
|
|
|
+ return true; // CraftBukkit
|
|
}
|
|
|
|
private boolean g() {
|