mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-06 18:50:51 +01:00
cdc3b28062
This adds a very cheap distance check when an end crystal is placed. Attempting to respawn the dragon, which involves looking up the end crystal entities near the portal, every time an end crystal is placed, can be slow on some servers that have players placing end crystals as a style of combat. The very cheap distance check prevents running the entity lookup every time.
31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
--- a/net/minecraft/world/item/EndCrystalItem.java
|
|
+++ b/net/minecraft/world/item/EndCrystalItem.java
|
|
@@ -30,7 +30,7 @@
|
|
if (!iblockdata.is(Blocks.OBSIDIAN) && !iblockdata.is(Blocks.BEDROCK)) {
|
|
return InteractionResult.FAIL;
|
|
} else {
|
|
- BlockPos blockposition1 = blockposition.above();
|
|
+ BlockPos blockposition1 = blockposition.above(); final BlockPos aboveBlockPosition = blockposition1; // Paper - OBFHELPER
|
|
|
|
if (!world.isEmptyBlock(blockposition1)) {
|
|
return InteractionResult.FAIL;
|
|
@@ -47,12 +47,18 @@
|
|
EndCrystal entityendercrystal = new EndCrystal(world, d0 + 0.5D, d1, d2 + 0.5D);
|
|
|
|
entityendercrystal.setShowBottom(false);
|
|
+ // CraftBukkit start
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityPlaceEvent(context, entityendercrystal).isCancelled()) {
|
|
+ if (context.getPlayer() != null) context.getPlayer().containerMenu.sendAllDataToRemote(); // Paper - Fix inventory desync
|
|
+ return InteractionResult.FAIL;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
world.addFreshEntity(entityendercrystal);
|
|
world.gameEvent((Entity) context.getPlayer(), (Holder) GameEvent.ENTITY_PLACE, blockposition1);
|
|
EndDragonFight enderdragonbattle = ((ServerLevel) world).getDragonFight();
|
|
|
|
if (enderdragonbattle != null) {
|
|
- enderdragonbattle.tryRespawn();
|
|
+ enderdragonbattle.tryRespawn(aboveBlockPosition); // Paper - Perf: Do crystal-portal proximity check before entity lookup
|
|
}
|
|
}
|
|
|