diff options
author | Rigby <rigby@onarandombox.com> | 2011-06-20 06:34:17 +0100 |
---|---|---|
committer | EvilSeph <evilseph@unaligned.org> | 2011-06-20 18:33:21 -0400 |
commit | 138c70183d9c45d21b9fa9e5917ded2d8aadfa28 (patch) | |
tree | b90427f584c68dc505929e735c146ecc0842f0c7 /src/main | |
parent | 214d412505bfbdb1b85189444082473765dee125 (diff) | |
download | craftbukkit-138c70183d9c45d21b9fa9e5917ded2d8aadfa28.tar craftbukkit-138c70183d9c45d21b9fa9e5917ded2d8aadfa28.tar.gz craftbukkit-138c70183d9c45d21b9fa9e5917ded2d8aadfa28.tar.lz craftbukkit-138c70183d9c45d21b9fa9e5917ded2d8aadfa28.tar.xz craftbukkit-138c70183d9c45d21b9fa9e5917ded2d8aadfa28.zip |
Changed Nether portals to be handled by a customiseable PortalTravelAgent and updated the PlayerPortalEvent
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/net/minecraft/server/ServerConfigurationManager.java | 84 | ||||
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java | 379 |
2 files changed, 393 insertions, 70 deletions
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java index 24183bfc..b419642d 100644 --- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java +++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java @@ -272,83 +272,27 @@ public class ServerConfigurationManager { } public void f(EntityPlayer entityplayer) { - WorldServer worldserver = this.server.a(entityplayer.dimension); - boolean flag = false; - int b0; // CraftBukkit - byte -> int - - if (entityplayer.dimension == -1) { - b0 = 0; - } else { - b0 = -1; - } - - /* CraftBukkit start - entityplayer.dimension = b0; - WorldServer worldserver1 = this.server.a(entityplayer.dimension); - - entityplayer.netServerHandler.sendPacket(new Packet9Respawn((byte) entityplayer.dimension)); - worldserver.removeEntity(entityplayer); - entityplayer.dead = false; - // CraftBukkit end */ - double d0 = entityplayer.locX; - double d1 = entityplayer.locZ; - double d2 = 8.0D; - - if (b0 == -1) { // CraftBukkit - entityplayer.dimension -> b0 - d0 /= d2; - d1 /= d2; - entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch); - if (entityplayer.S()) { - worldserver.entityJoinedWorld(entityplayer, false); - } - } else { - d0 *= d2; - d1 *= d2; - entityplayer.setPositionRotation(d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch); - if (entityplayer.S()) { - worldserver.entityJoinedWorld(entityplayer, false); - } - } + // CraftBukkit start -- Replaced the standard handling of portals with a more customised method. + int dimension = entityplayer.dimension; + WorldServer fromWorld = this.server.a(dimension); + WorldServer toWorld = this.server.a(dimension == -1 ? 0 : -1); + double blockRatio = dimension == -1 ? 8 : 0.125; - // CraftBukkit start - CraftWorld fromCraftWorld = worldserver.getWorld(); - CraftWorld toCraftWorld = this.server.a(b0).getWorld(); - Location startLocation = new Location(fromCraftWorld, entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch); - Location endLocation = new Location(toCraftWorld, d0, entityplayer.locY, d1, entityplayer.yaw, entityplayer.pitch); + Location fromLocation = new Location(fromWorld.getWorld(), entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch); + Location toLocation = new Location(toWorld.getWorld(), (entityplayer.locX * blockRatio), entityplayer.locY, (entityplayer.locZ * blockRatio), entityplayer.yaw, entityplayer.pitch); - PlayerPortalEvent event = new PlayerPortalEvent((Player) entityplayer.getBukkitEntity(), startLocation, endLocation); + org.bukkit.craftbukkit.PortalTravelAgent pta = new org.bukkit.craftbukkit.PortalTravelAgent(); + PlayerPortalEvent event = new PlayerPortalEvent((Player) entityplayer.getBukkitEntity(), fromLocation, toLocation, pta); Bukkit.getServer().getPluginManager().callEvent(event); if (event.isCancelled()) { return; } - endLocation = event.getTo(); - - b0 = ((CraftWorld) endLocation.getWorld()).getHandle().dimension; - - WorldServer worldserver1 = this.server.a(b0); - - if (entityplayer.S()) { - // worldserver1.addEntity(entityplayer); - entityplayer.setPositionRotation(endLocation.getX(), endLocation.getY(), endLocation.getZ(), endLocation.getYaw(), endLocation.getPitch()); - worldserver1.entityJoinedWorld(entityplayer, false); - if (event.useTravelAgent()) { - worldserver1.chunkProviderServer.a = true; - (new PortalTravelAgent()).a(worldserver1, entityplayer); - worldserver1.chunkProviderServer.a = false; - endLocation.setX(entityplayer.locX); - endLocation.setY(entityplayer.locY); - endLocation.setZ(entityplayer.locZ); - } + Location finalLocation = event.getTo(); + if(event.useTravelAgent()){ + finalLocation = pta.findOrCreate(finalLocation); } - - /* CraftBukkit -- not needed - this.a(entityplayer); - entityplayer.netServerHandler.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch); - entityplayer.a((World) worldserver1); - this.a(entityplayer, worldserver1); - this.g(entityplayer); - // CraftBukkit */ - this.a(entityplayer, b0, endLocation); + toWorld = ((CraftWorld) finalLocation.getWorld()).getHandle(); + this.a(entityplayer, toWorld.dimension, finalLocation); // CraftBukkit end } diff --git a/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java b/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java new file mode 100644 index 00000000..70878e0d --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/PortalTravelAgent.java @@ -0,0 +1,379 @@ +package org.bukkit.craftbukkit; + +import java.util.Random; + +import net.minecraft.server.Block; +import net.minecraft.server.WorldServer; + +import org.bukkit.Bukkit; +import org.bukkit.Location; +import org.bukkit.TravelAgent; +import org.bukkit.event.world.PortalCreateEvent; + +public class PortalTravelAgent implements TravelAgent { + + private Random random = new Random(); + + private int searchRadius = 128; + private int creationRadius = 14; // 16 -> 14 + private boolean canCreatePortal = true; + + public PortalTravelAgent() { } + + public Location findOrCreate(Location location) { + WorldServer worldServer = ((CraftWorld) location.getWorld()).getHandle(); + worldServer.chunkProviderServer.a = true; + // Attempt to find a Portal. + Location resultLocation = this.findPortal(location); + // If a Portal cannot be found we will attempt to create one. + if (resultLocation == null) { + // Attempt to create a portal, return if it was successful or not. + if (this.canCreatePortal && this.createPortal(location)) { + // Now find that portals location. + resultLocation = this.findPortal(location); + } else { + // Fallback onto the original location. + resultLocation = location; + } + } + worldServer.chunkProviderServer.a = false; + // Return our resulting portal location. + return resultLocation; + } + + public Location findPortal(Location location) { + net.minecraft.server.World world = ((CraftWorld) location.getWorld()).getHandle(); + // short short1 = 128; + double d0 = -1.0D; + int i = 0; + int j = 0; + int k = 0; + int l = location.getBlockX(); + int i1 = location.getBlockZ(); + + double d1; + + for (int j1 = l - searchRadius; j1 <= l + searchRadius; ++j1) { + double d2 = (double) j1 + 0.5D - location.getX(); + + for (int k1 = i1 - searchRadius; k1 <= i1 + searchRadius; ++k1) { + double d3 = (double) k1 + 0.5D - location.getZ(); + + for (int l1 = 127; l1 >= 0; --l1) { + if (world.getTypeId(j1, l1, k1) == Block.PORTAL.id) { + while (world.getTypeId(j1, l1 - 1, k1) == Block.PORTAL.id) { + --l1; + } + + d1 = (double) l1 + 0.5D - location.getY(); + double d4 = d2 * d2 + d1 * d1 + d3 * d3; + + if (d0 < 0.0D || d4 < d0) { + d0 = d4; + i = j1; + j = l1; + k = k1; + } + } + } + } + } + + if (d0 >= 0.0D) { + double d5 = (double) i + 0.5D; + double d6 = (double) j + 0.5D; + + d1 = (double) k + 0.5D; + if (world.getTypeId(i - 1, j, k) == Block.PORTAL.id) { + d5 -= 0.5D; + } + + if (world.getTypeId(i + 1, j, k) == Block.PORTAL.id) { + d5 += 0.5D; + } + + if (world.getTypeId(i, j, k - 1) == Block.PORTAL.id) { + d1 -= 0.5D; + } + + if (world.getTypeId(i, j, k + 1) == Block.PORTAL.id) { + d1 += 0.5D; + } + + return new Location(location.getWorld(), d5, d6, d1, location.getYaw(), location.getPitch()); + } else { + return null; + } + } + + public boolean createPortal(Location location) { + net.minecraft.server.World world = ((CraftWorld) location.getWorld()).getHandle(); + // byte b0 = 16; + double d0 = -1.0D; + int i = location.getBlockX(); + int j = location.getBlockY(); + int k = location.getBlockZ(); + int l = i; + int i1 = j; + int j1 = k; + int k1 = 0; + int l1 = this.random.nextInt(4); + + int i2; + double d1; + int j2; + double d2; + int k2; + int l2; + int i3; + int j3; + int k3; + int l3; + int i4; + int j4; + int k4; + double d3; + double d4; + + for (i2 = i - creationRadius; i2 <= i + creationRadius; ++i2) { + d1 = (double) i2 + 0.5D - location.getX(); + + for (j2 = k - creationRadius; j2 <= k + creationRadius; ++j2) { + d2 = (double) j2 + 0.5D - location.getZ(); + + label271: + for (l2 = 127; l2 >= 0; --l2) { + if (world.isEmpty(i2, l2, j2)) { + while (l2 > 0 && world.isEmpty(i2, l2 - 1, j2)) { + --l2; + } + + for (k2 = l1; k2 < l1 + 4; ++k2) { + j3 = k2 % 2; + i3 = 1 - j3; + if (k2 % 4 >= 2) { + j3 = -j3; + i3 = -i3; + } + + for (l3 = 0; l3 < 3; ++l3) { + for (k3 = 0; k3 < 4; ++k3) { + for (j4 = -1; j4 < 5; ++j4) { + i4 = i2 + (k3 - 1) * j3 + l3 * i3; + k4 = l2 + j4; + int l4 = j2 + (k3 - 1) * i3 - l3 * j3; + + if (j4 < 0 && !world.getMaterial(i4, k4, l4).isBuildable() || j4 >= 0 && !world.isEmpty(i4, k4, l4)) { + continue label271; + } + } + } + } + + d3 = (double) l2 + 0.5D - location.getY(); + d4 = d1 * d1 + d3 * d3 + d2 * d2; + if (d0 < 0.0D || d4 < d0) { + d0 = d4; + l = i2; + i1 = l2 + 1; + j1 = j2; + k1 = k2 % 4; + } + } + } + } + } + } + + if (d0 < 0.0D) { + for (i2 = i - creationRadius; i2 <= i + creationRadius; ++i2) { + d1 = (double) i2 + 0.5D - location.getX(); + + for (j2 = k - creationRadius; j2 <= k + creationRadius; ++j2) { + d2 = (double) j2 + 0.5D - location.getZ(); + + label219: + for (l2 = 127; l2 >= 0; --l2) { + if (world.isEmpty(i2, l2, j2)) { + while (l2 > 0 && world.isEmpty(i2, l2 - 1, j2)) { + --l2; + } + + for (k2 = l1; k2 < l1 + 2; ++k2) { + j3 = k2 % 2; + i3 = 1 - j3; + + for (l3 = 0; l3 < 4; ++l3) { + for (k3 = -1; k3 < 5; ++k3) { + j4 = i2 + (l3 - 1) * j3; + i4 = l2 + k3; + k4 = j2 + (l3 - 1) * i3; + if (k3 < 0 && !world.getMaterial(j4, i4, k4).isBuildable() || k3 >= 0 && !world.isEmpty(j4, i4, k4)) { + continue label219; + } + } + } + + d3 = (double) l2 + 0.5D - location.getY(); + d4 = d1 * d1 + d3 * d3 + d2 * d2; + if (d0 < 0.0D || d4 < d0) { + d0 = d4; + l = i2; + i1 = l2 + 1; + j1 = j2; + k1 = k2 % 2; + } + } + } + } + } + } + } + + int i5 = l; + int j5 = i1; + + j2 = j1; + int k5 = k1 % 2; + int l5 = 1 - k5; + + if (k1 % 4 >= 2) { + k5 = -k5; + l5 = -l5; + } + + boolean flag; + + // CraftBukkit start - portal create event + java.util.ArrayList<org.bukkit.block.Block> blocks = new java.util.ArrayList<org.bukkit.block.Block>(); + // Find out what blocks the portal is going to modify, duplicated from below + CraftWorld craftWorld = ((WorldServer) world).getWorld(); + + if (d0 < 0.0D) { + if (i1 < 70) { + i1 = 70; + } + + if (i1 > 118) { + i1 = 118; + } + + j5 = i1; + + for (l2 = -1; l2 <= 1; ++l2) { + for (k2 = 1; k2 < 3; ++k2) { + for (j3 = -1; j3 < 3; ++j3) { + i3 = i5 + (k2 - 1) * k5 + l2 * l5; + l3 = j5 + j3; + k3 = j2 + (k2 - 1) * l5 - l2 * k5; + org.bukkit.block.Block b = craftWorld.getBlockAt(i3, l3, k3); + if (!blocks.contains(b)) { + blocks.add(b); + } + } + } + } + } + + for (l2 = 0; l2 < 4; ++l2) { + for (k2 = 0; k2 < 4; ++k2) { + for (j3 = -1; j3 < 4; ++j3) { + i3 = i5 + (k2 - 1) * k5; + l3 = j5 + j3; + k3 = j2 + (k2 - 1) * l5; + org.bukkit.block.Block b = craftWorld.getBlockAt(i3, l3, k3); + 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 + + if (d0 < 0.0D) { + if (i1 < 70) { + i1 = 70; + } + + if (i1 > 118) { + i1 = 118; + } + + j5 = i1; + + for (l2 = -1; l2 <= 1; ++l2) { + for (k2 = 1; k2 < 3; ++k2) { + for (j3 = -1; j3 < 3; ++j3) { + i3 = i5 + (k2 - 1) * k5 + l2 * l5; + l3 = j5 + j3; + k3 = j2 + (k2 - 1) * l5 - l2 * k5; + flag = j3 < 0; + world.setTypeId(i3, l3, k3, flag ? Block.OBSIDIAN.id : 0); + } + } + } + } + + for (l2 = 0; l2 < 4; ++l2) { + world.o = true; + + for (k2 = 0; k2 < 4; ++k2) { + for (j3 = -1; j3 < 4; ++j3) { + i3 = i5 + (k2 - 1) * k5; + l3 = j5 + j3; + k3 = j2 + (k2 - 1) * l5; + flag = k2 == 0 || k2 == 3 || j3 == -1 || j3 == 3; + world.setTypeId(i3, l3, k3, flag ? Block.OBSIDIAN.id : Block.PORTAL.id); + } + } + + world.o = false; + + for (k2 = 0; k2 < 4; ++k2) { + for (j3 = -1; j3 < 4; ++j3) { + i3 = i5 + (k2 - 1) * k5; + l3 = j5 + j3; + k3 = j2 + (k2 - 1) * l5; + world.applyPhysics(i3, l3, k3, world.getTypeId(i3, l3, k3)); + } + } + } + + return true; + } + + + + + public TravelAgent setSearchRadius(int radius) { + this.searchRadius = radius; + return this; + } + + public int getSearchRadius() { + return this.searchRadius; + } + + public TravelAgent setCreationRadius(int radius) { + this.creationRadius = radius < 2 ? 0 : radius - 2; + return this; + } + + public int getCreationRadius() { + return this.creationRadius; + } + + public boolean getCanCreatePortal() { + return this.canCreatePortal; + } + + public void setCanCreatePortal(boolean create) { + this.canCreatePortal = create; + } +} |