mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-29 23:09:33 +01:00
2365b308c8
Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes:4824655cSPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 supporteea43870MC-134115: Fix issues converting tile entities1a7f2d10SPIGOT-4397: isChunkGenerated API40aed54dSPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches
25 lines
1.3 KiB
Diff
25 lines
1.3 KiB
Diff
From 3ea8c91ea0db1aace5cffaf8bc8712928c962e43 Mon Sep 17 00:00:00 2001
|
|
From: Byteflux <byte@byteflux.net>
|
|
Date: Tue, 1 Mar 2016 15:08:03 -0600
|
|
Subject: [PATCH] Remove invalid mob spawner tile entities
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
|
index e737d5a4df..2f33b4208c 100644
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
|
@@ -792,6 +792,10 @@ public class Chunk implements IChunkAccess {
|
|
tileentity.z();
|
|
this.tileEntities.put(blockposition, tileentity);
|
|
// CraftBukkit start
|
|
+ // Paper start - Remove invalid mob spawner tile entities
|
|
+ } else if (tileentity instanceof TileEntityMobSpawner && !(getBlockData(blockposition.getX(), blockposition.getY(), blockposition.getZ()).getBlock() instanceof BlockMobSpawner)) {
|
|
+ this.tileEntities.remove(blockposition);
|
|
+ // Paper end
|
|
} else {
|
|
System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ()
|
|
+ " (" + getType(blockposition) + ") where there was no entity tile!");
|
|
--
|
|
2.19.0
|
|
|