Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 03:20:07 +01:00
dd11ef8441
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: 3a3bea52 SPIGOT-7829: Increase maximum outgoing plugin message size to match Vanilla intention 5cd1c8cb SPIGOT-7831: Add CreatureSpawnEvent.SpawnReason#POTION_EFFECT a8e278f0 SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals 53729d12 Remove spurious ApiStatus.Internal annotation b9f57486 SPIGOT-7799, PR-1039: Expose explosion world interaction in EntityExplodeEvent and BlockExplodeEvent 7983b966 PR-1029: Trial changing a small number of inner enums to classes/interfaces to better support custom values CraftBukkit Changes: 403accd56 SPIGOT-7831: Add CreatureSpawnEvent.SpawnReason#POTION_EFFECT 812761660 Increase outdated build delay bed1e3ff6 SPIGOT-7827: Sync EntityPortalEvent with PlayerPortalEvent since non-players can now create portals 2444c8b23 SPIGOT-7823: Suspicious sand and gravel material are not marked as having gravity correctly aceddcd0b SPIGOT-7820: Enum changes - duplicate method name a0d2d6a84 SPIGOT-7813: Material#isInteractable() always returns false 8fd64b091 SPIGOT-7806: Handle both loot and inventory item drop behaviour in PlayerDeathEvent a4ee40b74 SPIGOT-7799, PR-1436: Expose explosion world interaction in EntityExplodeEvent and BlockExplodeEvent 082aa51c5 PR-1424: Trial changing a small number of inner enums to classes/interfaces to better support custom values 66e78a96b SPIGOT-7815: Consider EntityDamageEvent status for Wolf armor damage Spigot Changes: 5bbef5ad SPIGOT-7834: Modify max value for generic.max_absorption
114 Zeilen
6.2 KiB
Diff
114 Zeilen
6.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 10 Nov 2017 23:03:12 -0500
|
|
Subject: [PATCH] ExperienceOrb merging/stacking API and fixes
|
|
|
|
Adds an option for maximum exp value when merging orbs
|
|
|
|
Adds ExperienceOrbMergeEvent
|
|
Fired when the server is about to merge 2 experience orbs
|
|
as entities. Plugins can cancel it if they want to ensure experience orbs do not lose important
|
|
metadata such as spawn reason, or conditionally move data from source to target.
|
|
|
|
Fixes an issue where the stacked count was not taking into account
|
|
for mending repairs and when merging with spigot's merge-on-spawn
|
|
logic
|
|
|
|
== AT ==
|
|
public net.minecraft.world.entity.ExperienceOrb count
|
|
|
|
Co-authored-by: Aikar <aikar@aikar.co>
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
index 0916e24271d07ad5db51c5bc68791722b0f69c2b..a758b2456acac23095fe4619ae10300a034cb460 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
@@ -244,6 +244,7 @@ public class ExperienceOrb extends Entity {
|
|
}
|
|
|
|
private static boolean tryMergeToExisting(ServerLevel world, Vec3 pos, int amount) {
|
|
+ // Paper - TODO some other event for this kind of merge
|
|
AABB axisalignedbb = AABB.ofSize(pos, 1.0D, 1.0D, 1.0D);
|
|
int j = world.getRandom().nextInt(40);
|
|
List<ExperienceOrb> list = world.getEntities(EntityTypeTest.forClass(ExperienceOrb.class), axisalignedbb, (entityexperienceorb) -> {
|
|
@@ -270,6 +271,11 @@ public class ExperienceOrb extends Entity {
|
|
}
|
|
|
|
private void merge(ExperienceOrb other) {
|
|
+ // Paper start - call orb merge event
|
|
+ if (!new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) this.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) other.getBukkitEntity()).callEvent()) {
|
|
+ return;
|
|
+ }
|
|
+ // Paper end - call orb merge event
|
|
this.count += other.count;
|
|
this.age = Math.min(this.age, other.age);
|
|
other.discard(EntityRemoveEvent.Cause.MERGE); // CraftBukkit - add Bukkit remove cause
|
|
@@ -360,7 +366,7 @@ public class ExperienceOrb extends Entity {
|
|
int l = amount - k * amount / j;
|
|
|
|
if (l > 0) {
|
|
- this.value = l; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls
|
|
+ // this.value = l; // CraftBukkit - update exp value of orb for PlayerItemMendEvent calls // Paper - the value field should not be mutated here because it doesn't take "count" into account
|
|
return this.repairPlayerItems(player, l);
|
|
}
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
|
|
index 5a7d314ec0562e472f5dc45924a7b24841cff126..650e4a01cecc4cc08e7ff9ebcc4c367084351f21 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
|
|
@@ -18,6 +18,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
|
|
this.getHandle().value = value;
|
|
}
|
|
|
|
+ // Paper start - expose count
|
|
+ @Override
|
|
+ public int getCount() {
|
|
+ return this.getHandle().count;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCount(final int count) {
|
|
+ this.getHandle().count = count;
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
// Paper start
|
|
public java.util.UUID getTriggerEntityId() {
|
|
return getHandle().triggerEntityId;
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index e0cbef395c479da40dc7079835f0eae1ee122da1..ec364ab90df6276c1976e876337636f4bb06d097 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -708,15 +708,29 @@ public class CraftEventFactory {
|
|
if (entity instanceof net.minecraft.world.entity.ExperienceOrb xp) {
|
|
double radius = world.spigotConfig.expMerge;
|
|
if (radius > 0) {
|
|
+ // Paper start - Maximum exp value when merging; Whole section has been tweaked, see comments for specifics
|
|
+ final long maxValue = world.paperConfig().entities.behavior.experienceMergeMaxValue;
|
|
+ final boolean mergeUnconditionally = maxValue <= 0;
|
|
+ if (mergeUnconditionally || xp.value < maxValue) { // Paper - Skip iteration if unnecessary
|
|
+
|
|
List<Entity> entities = world.getEntities(entity, entity.getBoundingBox().inflate(radius, radius, radius));
|
|
for (Entity e : entities) {
|
|
if (e instanceof net.minecraft.world.entity.ExperienceOrb loopItem) {
|
|
- if (!loopItem.isRemoved()) {
|
|
+ // Paper start
|
|
+ if (!loopItem.isRemoved() && xp.count == loopItem.count && (mergeUnconditionally || loopItem.value < maxValue) && new com.destroystokyo.paper.event.entity.ExperienceOrbMergeEvent((org.bukkit.entity.ExperienceOrb) entity.getBukkitEntity(), (org.bukkit.entity.ExperienceOrb) loopItem.getBukkitEntity()).callEvent()) { // Paper - ExperienceOrbMergeEvent
|
|
+ long newTotal = (long)xp.value + (long)loopItem.value;
|
|
+ if ((int) newTotal < 0) continue; // Overflow
|
|
+ if (!mergeUnconditionally && newTotal > maxValue) {
|
|
+ loopItem.value = (int) (newTotal - maxValue);
|
|
+ xp.value = (int) maxValue;
|
|
+ } else {
|
|
xp.value += loopItem.value;
|
|
loopItem.discard(null); // Add Bukkit remove cause
|
|
+ } // Paper end - Maximum exp value when merging
|
|
}
|
|
}
|
|
}
|
|
+ } // Paper end - End iteration skip check - All tweaking ends here
|
|
}
|
|
}
|
|
// Spigot end
|