mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
36 lines
2.4 KiB
Diff
36 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Sun, 6 Apr 2025 10:42:46 +0800
|
|
Subject: [PATCH] Fix SculkCatalyst exp skip
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 03778c286144d8f04147f37aa59fb73fcc584833..daea37a117101a9f3b463e87bfc8f0f9db394aca 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -851,7 +851,7 @@ public class CraftEventFactory {
|
|
CraftLivingEntity entity = (CraftLivingEntity) victim.getBukkitEntity();
|
|
CraftDamageSource bukkitDamageSource = new CraftDamageSource(damageSource);
|
|
CraftWorld world = (CraftWorld) entity.getWorld();
|
|
- EntityDeathEvent event = new EntityDeathEvent(entity, bukkitDamageSource, new io.papermc.paper.util.TransformingRandomAccessList<>(drops, Entity.DefaultDrop::stack, FROM_FUNCTION), victim.getExpReward(world.getHandle(), damageSource.getEntity())); // Paper - Restore vanilla drops behavior
|
|
+ EntityDeathEvent event = new EntityDeathEvent(entity, bukkitDamageSource, new io.papermc.paper.util.TransformingRandomAccessList<>(drops, Entity.DefaultDrop::stack, FROM_FUNCTION), victim.getExpReward(world.getHandle(), damageSource.getEntity()), victim.getExperienceReward(world.getHandle(), damageSource.getEntity())); // Paper - Restore vanilla drops behavior // Leaves - exp fix
|
|
populateFields(victim, event); // Paper - make cancellable
|
|
Bukkit.getServer().getPluginManager().callEvent(event);
|
|
|
|
@@ -862,6 +862,7 @@ public class CraftEventFactory {
|
|
playDeathSound(victim, event, damageSource);
|
|
// Paper end
|
|
victim.expToDrop = event.getDroppedExp();
|
|
+ victim.expToReward = event.getRewardExp(); // Leaves - exp fix
|
|
lootCheck.run(); // Paper - advancement triggers before destroying items
|
|
|
|
// Paper start - Restore vanilla drops behavior
|
|
@@ -901,6 +902,7 @@ public class CraftEventFactory {
|
|
victim.newLevel = event.getNewLevel();
|
|
victim.newTotalExp = event.getNewTotalExp();
|
|
victim.expToDrop = event.getDroppedExp();
|
|
+ victim.expToReward = event.getRewardExp(); // Leaves - exp fix
|
|
victim.newExp = event.getNewExp();
|
|
|
|
// Paper start - Restore vanilla drops behavior
|