2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Aikar <aikar@aikar.co>
|
|
|
|
Date: Tue, 19 Dec 2017 22:56:24 -0500
|
2024-05-29 22:58:57 +02:00
|
|
|
Subject: [PATCH] ExperienceOrb merging/stacking API
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2024-05-29 22:58:57 +02:00
|
|
|
Adds ExperienceOrbMergeEvent
|
2021-06-11 14:02:28 +02:00
|
|
|
Fired when the server is about to merge 2 experience orbs
|
|
|
|
Plugins can cancel this if they want to ensure experience orbs do not lose important
|
|
|
|
metadata such as spawn reason, or conditionally move data from source to target.
|
|
|
|
|
2024-05-29 22:58:57 +02:00
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
|
|
|
|
new file mode 100644
|
2024-09-29 21:52:13 +02:00
|
|
|
index 0000000000000000000000000000000000000000..5902e6d6c0516a1249c72b405a49dfc5cc490e0e
|
2021-06-11 14:02:28 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java
|
2024-09-29 21:52:13 +02:00
|
|
|
@@ -0,0 +1,88 @@
|
2021-06-11 14:02:28 +02:00
|
|
|
+/*
|
|
|
|
+ * Copyright (c) 2017 Daniel Ennis (Aikar) MIT License
|
|
|
|
+ *
|
|
|
|
+ * Permission is hereby granted, free of charge, to any person obtaining
|
|
|
|
+ * a copy of this software and associated documentation files (the
|
|
|
|
+ * "Software"), to deal in the Software without restriction, including
|
|
|
|
+ * without limitation the rights to use, copy, modify, merge, publish,
|
|
|
|
+ * distribute, sublicense, and/or sell copies of the Software, and to
|
|
|
|
+ * permit persons to whom the Software is furnished to do so, subject to
|
|
|
|
+ * the following conditions:
|
|
|
|
+ *
|
|
|
|
+ * The above copyright notice and this permission notice shall be
|
|
|
|
+ * included in all copies or substantial portions of the Software.
|
|
|
|
+ *
|
|
|
|
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
|
|
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
|
|
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
|
|
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
|
|
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
|
|
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
|
|
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
+ */
|
|
|
|
+
|
|
|
|
+package com.destroystokyo.paper.event.entity;
|
|
|
|
+
|
|
|
|
+import org.bukkit.entity.ExperienceOrb;
|
|
|
|
+import org.bukkit.event.Cancellable;
|
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.entity.EntityEvent;
|
2024-02-01 10:15:57 +01:00
|
|
|
+import org.jetbrains.annotations.ApiStatus;
|
2024-09-29 21:52:13 +02:00
|
|
|
+import org.jspecify.annotations.NullMarked;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Fired anytime the server is about to merge 2 experience orbs into one
|
|
|
|
+ */
|
2024-09-29 21:52:13 +02:00
|
|
|
+@NullMarked
|
2021-06-11 14:02:28 +02:00
|
|
|
+public class ExperienceOrbMergeEvent extends EntityEvent implements Cancellable {
|
2024-02-01 10:15:57 +01:00
|
|
|
+
|
|
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
|
|
+
|
2024-09-29 21:52:13 +02:00
|
|
|
+ private final ExperienceOrb mergeTarget;
|
|
|
|
+ private final ExperienceOrb mergeSource;
|
2021-06-11 14:02:28 +02:00
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ private boolean cancelled;
|
|
|
|
+
|
|
|
|
+ @ApiStatus.Internal
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public ExperienceOrbMergeEvent(final ExperienceOrb mergeTarget, final ExperienceOrb mergeSource) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ super(mergeTarget);
|
|
|
|
+ this.mergeTarget = mergeTarget;
|
|
|
|
+ this.mergeSource = mergeSource;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @return The orb that will absorb the other experience orb
|
|
|
|
+ */
|
|
|
|
+ public ExperienceOrb getMergeTarget() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.mergeTarget;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * @return The orb that is subject to being removed and merged into the target orb
|
|
|
|
+ */
|
|
|
|
+ public ExperienceOrb getMergeSource() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.mergeSource;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isCancelled() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.cancelled;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @param cancel {@code true} if you wish to cancel this event, and prevent the orbs from merging
|
2021-06-11 14:02:28 +02:00
|
|
|
+ */
|
|
|
|
+ @Override
|
2024-09-29 21:52:13 +02:00
|
|
|
+ public void setCancelled(final boolean cancel) {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ this.cancelled = cancel;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return HANDLER_LIST;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return HANDLER_LIST;
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+}
|
2024-05-29 22:58:57 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java
|
|
|
|
index dec70bbfaf73a9d525b2c45682b804c684e1645b..0fe4a7f300287f38dbe15862787f387aba74397b 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/ExperienceOrb.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java
|
|
|
|
@@ -21,6 +21,22 @@ public interface ExperienceOrb extends Entity {
|
|
|
|
* @param value Amount of experience
|
|
|
|
*/
|
|
|
|
public void setExperience(int value);
|
|
|
|
+
|
|
|
|
+ // Paper start - expose count
|
|
|
|
+ /**
|
|
|
|
+ * Get the stacked count for this experience orb.
|
|
|
|
+ *
|
|
|
|
+ * @return the count
|
|
|
|
+ */
|
|
|
|
+ int getCount();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets the stacked count for this experience orb.
|
|
|
|
+ *
|
|
|
|
+ * @param count the new count
|
|
|
|
+ */
|
|
|
|
+ void setCount(int count);
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
// Paper start
|
|
|
|
/**
|