Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-07 00:48:28 +01:00
Code Issues Projects Releases Wiki Activity

Add getPlayer() to PickupExperienceEvent

Browse Source
This commit is contained in:
emortal 2021-08-19 05:05:00 +01:00
parent 9750e1fe8b
commit a0696bc20b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/entity/Player.java
View File

@ -318,9 +318,10 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
if (expandedBoundingBox.intersect(itemBoundingBox)) { if (expandedBoundingBox.intersect(itemBoundingBox)) {
if (experienceOrb.shouldRemove() || experienceOrb.isRemoveScheduled()) if (experienceOrb.shouldRemove() || experienceOrb.isRemoveScheduled())
continue; continue;
PickupExperienceEvent pickupExperienceEvent = new PickupExperienceEvent(experienceOrb); PickupExperienceEvent pickupExperienceEvent = new PickupExperienceEvent(experienceOrb, this);
EventDispatcher.callCancellable(pickupExperienceEvent, () -> { EventDispatcher.callCancellable(pickupExperienceEvent, () -> {
short experienceCount = pickupExperienceEvent.getExperienceCount(); // TODO give to player short experienceCount = pickupExperienceEvent.getExperienceCount();
this.setExp(this.getExp() + experienceCount);
entity.remove(); entity.remove();
}); });
} }

10
src/main/java/net/minestom/server/event/item/PickupExperienceEvent.java
View File

@ -1,18 +1,21 @@
package net.minestom.server.event.item; package net.minestom.server.event.item;
import net.minestom.server.entity.ExperienceOrb; import net.minestom.server.entity.ExperienceOrb;
import net.minestom.server.entity.Player;
import net.minestom.server.event.trait.CancellableEvent; import net.minestom.server.event.trait.CancellableEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class PickupExperienceEvent implements CancellableEvent { public class PickupExperienceEvent implements CancellableEvent {
private final ExperienceOrb experienceOrb; private final ExperienceOrb experienceOrb;
private final Player player;
private short experienceCount; private short experienceCount;
private boolean cancelled; private boolean cancelled;
public PickupExperienceEvent(@NotNull ExperienceOrb experienceOrb) { public PickupExperienceEvent(@NotNull ExperienceOrb experienceOrb, @NotNull Player player) {
this.experienceOrb = experienceOrb; this.experienceOrb = experienceOrb;
this.player = player;
this.experienceCount = experienceOrb.getExperienceCount(); this.experienceCount = experienceOrb.getExperienceCount();
} }
@ -21,6 +24,11 @@ public class PickupExperienceEvent implements CancellableEvent {
return experienceOrb; return experienceOrb;
} }
@NotNull
public Player getPlayer() {
return player;
}
public short getExperienceCount() { public short getExperienceCount() {
return experienceCount; return experienceCount;
} }