CraftBukkit
Public
Commits
md_5 authored 75fac431cfc
| 327 327 | this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3); |
| 328 328 | + // CraftBukkit start |
| 329 329 | + // From above, don't screw this up - SPIGOT-1746 |
| 330 330 | + if (!this.tileEntityList.contains(tileentity1)) { |
| 331 331 | + this.a(tileentity1); |
| 332 332 | + } |
| 333 333 | + // CraftBukkit end |
| 334 334 | } |
| 335 335 | } |
| 336 336 | } |
| 337 - | |
| 338 - | } |
| 339 - | } |
| 337 + | |
| 340 338 | |
| 341 - | + public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap(); |
| 342 339 | @Nullable |
| 343 340 | @Override |
| 341 + | + // CraftBukkit start |
| 344 342 | public TileEntity getTileEntity(BlockPosition blockposition) { |
| 345 - | |
| 343 + | + return getTileEntity(blockposition, true); |
| 344 + | + } |
| 345 + | + public Map<BlockPosition, TileEntity> capturedTileEntities = Maps.newHashMap(); |
| 346 + | + |
| 347 + | + @Nullable |
| 348 + | + protected TileEntity getTileEntity(BlockPosition blockposition, boolean validate) { |
| 349 + | + // CraftBukkit end |
| 350 + | if (isOutsideWorld(blockposition)) { |
| 351 + | return null; |
| 346 352 | } else if (!this.isClientSide && Thread.currentThread() != this.serverThread) { |
| 347 353 | return null; |
| 348 354 | } else { |
| 349 355 | + // CraftBukkit start |
| 350 356 | + if (capturedTileEntities.containsKey(blockposition)) { |
| 351 357 | + return capturedTileEntities.get(blockposition); |
| 352 358 | + } |
| 353 359 | + // CraftBukkit end |
| 354 360 | + |
| 355 361 | TileEntity tileentity = null; |
| 356 362 | |
| 357 363 | if (this.tickingTileEntities) { |
| 358 - | |
| 364 + | |
| 359 365 | public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) { |
| 360 366 | if (!isOutsideWorld(blockposition)) { |
| 361 367 | if (tileentity != null && !tileentity.isRemoved()) { |
| 362 368 | + // CraftBukkit start |
| 363 369 | + if (captureBlockStates) { |
| 364 370 | + tileentity.setLocation(this, blockposition); |
| 365 371 | + capturedTileEntities.put(blockposition, tileentity); |
| 366 372 | + return; |
| 367 373 | + } |
| 368 374 | + // CraftBukkit end |
| 369 375 | if (this.tickingTileEntities) { |
| 370 376 | tileentity.setLocation(this, blockposition); |
| 371 377 | Iterator iterator = this.tileEntityListPending.iterator(); |
| 378 + | |
| 379 + | } |
| 380 + | |
| 381 + | public void removeTileEntity(BlockPosition blockposition) { |
| 382 + | - TileEntity tileentity = this.getTileEntity(blockposition); |
| 383 + | + TileEntity tileentity = this.getTileEntity(blockposition, false); // CraftBukkit |
| 384 + | |
| 385 + | if (tileentity != null && this.tickingTileEntities) { |
| 386 + | tileentity.ab_(); |