SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.16.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-08-12 07:00:00 +10:00
parent 5e5f7f19dc
commit 6a9e00d4b6
208 changed files with 2144 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
paper-server/nms-patches/TileEntityEndGateway.patch
View File

@@ -13,8 +13,8 @@
public class TileEntityEndGateway extends TileEntityEnderPortal implements ITickable {
@@ -113,7 +119,7 @@
public void a(Entity entity) {
@@ -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) {
@@ -22,7 +22,7 @@
this.a((WorldServer) this.world);
}
@@ -138,6 +144,26 @@
@@ -142,6 +148,27 @@
entity1 = entity.getRootVehicle();
}
@@ -39,6 +39,7 @@
+ return;
+ }
+
+ entity1.resetPortalCooldown();
+ ((EntityPlayer) entity1).playerConnection.teleport(teleEvent.getTo());
+ this.h(); // CraftBukkit - call at end of method
+ return;
@@ -46,24 +47,15 @@
+ }
+ // CraftBukkit end
+
entity1.resetPortalCooldown();
entity1.enderTeleportAndLoad((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D);
}
@@ -173,7 +199,7 @@
if (this.exitPortal == null) {
this.exitPortal = new BlockPosition(vec3d1.x + 0.5D, 75.0D, vec3d1.z + 0.5D);
TileEntityEndGateway.LOGGER.debug("Failed to find suitable block, settling on {}", this.exitPortal);
- WorldGenerator.END_ISLAND.b((WorldGenFeatureConfiguration) WorldGenFeatureConfiguration.k).a(worldserver, worldserver.getStructureManager(), worldserver.getChunkProvider().getChunkGenerator(), new Random(this.exitPortal.asLong()), this.exitPortal);
+ WorldGenerator.END_ISLAND.b(WorldGenFeatureConfiguration.k).a(worldserver, worldserver.getStructureManager(), worldserver.getChunkProvider().getChunkGenerator(), new Random(this.exitPortal.asLong()), this.exitPortal); // CraftBukkit - decompile error
} else {
TileEntityEndGateway.LOGGER.debug("Found block at {}", this.exitPortal);
}
@@ -241,7 +267,7 @@
@@ -246,7 +273,7 @@
}
private void a(WorldServer worldserver, BlockPosition blockposition) {
- WorldGenerator.END_GATEWAY.b((WorldGenFeatureConfiguration) WorldGenEndGatewayConfiguration.a(this.getPosition(), false)).a(worldserver, worldserver.getStructureManager(), worldserver.getChunkProvider().getChunkGenerator(), new Random(), blockposition);
+ WorldGenerator.END_GATEWAY.b(WorldGenEndGatewayConfiguration.a(this.getPosition(), false)).a(worldserver, worldserver.getStructureManager(), worldserver.getChunkProvider().getChunkGenerator(), new Random(), blockposition); // CraftBukkit - decompile error
- 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) {