geforkt von Mirrors/Paper
62 Zeilen
3.1 KiB
Diff
62 Zeilen
3.1 KiB
Diff
--- a/net/minecraft/server/TileEntityEndGateway.java
|
|
+++ b/net/minecraft/server/TileEntityEndGateway.java
|
|
@@ -6,6 +6,12 @@
|
|
import javax.annotation.Nullable;
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
+// CraftBukkit start
|
|
+import org.bukkit.Bukkit;
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.craftbukkit.entity.CraftPlayer;
|
|
+import org.bukkit.event.player.PlayerTeleportEvent;
|
|
+// CraftBukkit end
|
|
|
|
public class TileEntityEndGateway extends TileEntityEnderPortal implements ITickable {
|
|
|
|
@@ -117,7 +123,7 @@
|
|
public void b(Entity entity) {
|
|
if (this.world instanceof WorldServer && !this.f()) {
|
|
this.c = 100;
|
|
- if (this.exitPortal == null && this.world.getDimensionKey() == World.THE_END) {
|
|
+ if (this.exitPortal == null && this.world.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit - work in alternate worlds
|
|
this.a((WorldServer) this.world);
|
|
}
|
|
|
|
@@ -142,6 +148,27 @@
|
|
entity1 = entity.getRootVehicle();
|
|
}
|
|
|
|
+ // CraftBukkit start - Fire PlayerTeleportEvent
|
|
+ if (entity1 instanceof EntityPlayer) {
|
|
+ org.bukkit.craftbukkit.entity.CraftPlayer player = (CraftPlayer) entity1.getBukkitEntity();
|
|
+ org.bukkit.Location location = new Location(world.getWorld(), (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
|
|
+ location.setPitch(player.getLocation().getPitch());
|
|
+ location.setYaw(player.getLocation().getYaw());
|
|
+
|
|
+ PlayerTeleportEvent teleEvent = new PlayerTeleportEvent(player, player.getLocation(), location, PlayerTeleportEvent.TeleportCause.END_GATEWAY);
|
|
+ Bukkit.getPluginManager().callEvent(teleEvent);
|
|
+ if (teleEvent.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ entity1.resetPortalCooldown();
|
|
+ ((EntityPlayer) entity1).playerConnection.teleport(teleEvent.getTo());
|
|
+ this.h(); // CraftBukkit - call at end of method
|
|
+ return;
|
|
+
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
entity1.resetPortalCooldown();
|
|
entity1.enderTeleportAndLoad((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D);
|
|
}
|
|
@@ -246,7 +273,7 @@
|
|
}
|
|
|
|
private void a(WorldServer worldserver, BlockPosition blockposition) {
|
|
- WorldGenerator.END_GATEWAY.b((WorldGenFeatureConfiguration) WorldGenEndGatewayConfiguration.a(this.getPosition(), false)).a(worldserver, worldserver.getChunkProvider().getChunkGenerator(), new Random(), blockposition);
|
|
+ WorldGenerator.END_GATEWAY.b(WorldGenEndGatewayConfiguration.a(this.getPosition(), false)).a(worldserver, worldserver.getChunkProvider().getChunkGenerator(), new Random(), blockposition); // CraftBukkit - decompile error
|
|
}
|
|
|
|
public void a(BlockPosition blockposition, boolean flag) {
|