SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

SPIGOT-3725, SPIGOT-6638, MC-136917: Properly clear tile entities before replacing

Quellcode durchsuchen 
By: DerFrZocker <derrieple@gmail.com>
Dieser Commit ist enthalten in:
CraftBukkit/Spigot 2021-07-19 18:49:27 +10:00
Ursprung fd8748b4bd
Commit 1e8509d8ef
1 geänderte Dateien mit 1 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

7
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
Datei anzeigen

@ -19,7 +19,6 @@ import net.minecraft.world.level.GeneratorAccess;
import net.minecraft.world.level.RayTrace; import net.minecraft.world.level.RayTrace;
import net.minecraft.world.level.biome.BiomeBase; import net.minecraft.world.level.biome.BiomeBase;
import net.minecraft.world.level.block.BlockRedstoneWire; import net.minecraft.world.level.block.BlockRedstoneWire;
import net.minecraft.world.level.block.BlockTileEntity;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.entity.TileEntity; import net.minecraft.world.level.block.entity.TileEntity;
import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.block.state.IBlockData;
@ -74,10 +73,6 @@ public class CraftBlock implements Block {
return new CraftBlock(world, position); return new CraftBlock(world, position);
} }
private net.minecraft.world.level.block.Block getNMSBlock() {
return getNMS().getBlock();
}
public net.minecraft.world.level.block.state.IBlockData getNMS() { public net.minecraft.world.level.block.state.IBlockData getNMS() {
return world.getType(position); return world.getType(position);
} }
@ -189,7 +184,7 @@ public class CraftBlock implements Block {
public boolean setTypeAndData(final IBlockData blockData, final boolean applyPhysics) { public boolean setTypeAndData(final IBlockData blockData, final boolean applyPhysics) {
// SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup // SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup
if (!blockData.isAir() && blockData.getBlock() instanceof BlockTileEntity && blockData.getBlock() != getNMSBlock()) { if (getNMS().isTileEntity()) { // SPIGOT-3725 always remove old tile entity
// SPIGOT-4612: faster - just clear tile // SPIGOT-4612: faster - just clear tile
if (world instanceof net.minecraft.world.level.World) { if (world instanceof net.minecraft.world.level.World) {
((net.minecraft.world.level.World) world).removeTileEntity(position); ((net.minecraft.world.level.World) world).removeTileEntity(position);