mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-24 13:54:49 +02:00
ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
76 lines
4.2 KiB
Diff
76 lines
4.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Muijsers <martijnmuijsers@live.nl>
|
|
Date: Tue, 15 Aug 2023 21:04:55 +0200
|
|
Subject: [PATCH] Do crystal-portal proximity check before entity lookup
|
|
|
|
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.
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/EndCrystalItem.java b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
|
|
index f9a940cdff3983d9d4de46bd5ddc1905f9254dcf..dd1bdb4bb87a3a59c229ba76b36841d199717624 100644
|
|
--- a/src/main/java/net/minecraft/world/item/EndCrystalItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/EndCrystalItem.java
|
|
@@ -30,7 +30,7 @@ public class EndCrystalItem extends Item {
|
|
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;
|
|
@@ -57,7 +57,7 @@ public class EndCrystalItem extends Item {
|
|
EndDragonFight enderdragonbattle = ((ServerLevel) world).getDragonFight();
|
|
|
|
if (enderdragonbattle != null) {
|
|
- enderdragonbattle.tryRespawn();
|
|
+ enderdragonbattle.tryRespawn(aboveBlockPosition); // Paper - Perf: Do crystal-portal proximity check before entity lookup
|
|
}
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
|
|
index 6b59c4b5906c0fb4fdbc674452c6ff3df42b099b..18a1b4325cac81b040596071dab99ef9bf6f3142 100644
|
|
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
|
|
+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
|
|
@@ -558,6 +558,12 @@ public class EndDragonFight {
|
|
}
|
|
|
|
public boolean tryRespawn() { // CraftBukkit - return boolean
|
|
+ // Paper start - Perf: Do crystal-portal proximity check before entity lookup
|
|
+ return this.tryRespawn(null);
|
|
+ }
|
|
+
|
|
+ public boolean tryRespawn(@Nullable BlockPos placedEndCrystalPos) { // placedEndCrystalPos is null if the tryRespawn() call was not caused by a placed end crystal
|
|
+ // Paper end - Perf: Do crystal-portal proximity check before entity lookup
|
|
if (this.dragonKilled && this.respawnStage == null) {
|
|
BlockPos blockposition = this.portalLocation;
|
|
|
|
@@ -575,6 +581,22 @@ public class EndDragonFight {
|
|
blockposition = this.portalLocation;
|
|
}
|
|
|
|
+ // Paper start - Perf: Do crystal-portal proximity check before entity lookup
|
|
+ if (placedEndCrystalPos != null) {
|
|
+ // The end crystal must be 0 or 1 higher than the portal origin
|
|
+ int dy = placedEndCrystalPos.getY() - blockposition.getY();
|
|
+ if (dy != 0 && dy != 1) {
|
|
+ return false;
|
|
+ }
|
|
+ // The end crystal must be within a distance of 1 in one planar direction, and 3 in the other
|
|
+ int dx = placedEndCrystalPos.getX() - blockposition.getX();
|
|
+ int dz = placedEndCrystalPos.getZ() - blockposition.getZ();
|
|
+ if (!((dx >= -1 && dx <= 1 && dz >= -3 && dz <= 3) || (dx >= -3 && dx <= 3 && dz >= -1 && dz <= 1))) {
|
|
+ return false;
|
|
+ }
|
|
+ }
|
|
+ // Paper end - Perf: Do crystal-portal proximity check before entity lookup
|
|
+
|
|
List<EndCrystal> list = Lists.newArrayList();
|
|
BlockPos blockposition1 = blockposition.above(1);
|
|
Iterator iterator = Direction.Plane.HORIZONTAL.iterator();
|