mirror of
https://github.com/PaperMC/Paper.git
synced 2025-03-24 15:59:25 +01:00
Fire BlockExpEvent on grindstone use
This commit is contained in:
parent
2742ad6a9a
commit
7b8f630280
1 changed files with 10 additions and 6 deletions
|
@ -73,7 +73,7 @@
|
||||||
@Override
|
@Override
|
||||||
public boolean mayPlace(ItemStack stack) {
|
public boolean mayPlace(ItemStack stack) {
|
||||||
return stack.isDamageableItem() || EnchantmentHelper.hasAnyEnchantments(stack);
|
return stack.isDamageableItem() || EnchantmentHelper.hasAnyEnchantments(stack);
|
||||||
@@ -68,10 +95,10 @@
|
@@ -68,10 +95,14 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -82,11 +82,15 @@
|
||||||
context.execute((world, blockposition) -> {
|
context.execute((world, blockposition) -> {
|
||||||
if (world instanceof ServerLevel) {
|
if (world instanceof ServerLevel) {
|
||||||
- ExperienceOrb.award((ServerLevel) world, Vec3.atCenterOf(blockposition), this.getExperienceAmount(world));
|
- ExperienceOrb.award((ServerLevel) world, Vec3.atCenterOf(blockposition), this.getExperienceAmount(world));
|
||||||
+ ExperienceOrb.award((ServerLevel) world, Vec3.atCenterOf(blockposition), this.getExperienceAmount(world), org.bukkit.entity.ExperienceOrb.SpawnReason.GRINDSTONE, player); // Paper
|
+ // Paper start - Fire BlockExpEvent on grindstone use
|
||||||
|
+ org.bukkit.event.block.BlockExpEvent event = new org.bukkit.event.block.BlockExpEvent(org.bukkit.craftbukkit.block.CraftBlock.at(world, blockposition), this.getExperienceAmount(world));
|
||||||
|
+ event.callEvent();
|
||||||
|
+ ExperienceOrb.award((ServerLevel) world, Vec3.atCenterOf(blockposition), event.getExpToDrop(), org.bukkit.entity.ExperienceOrb.SpawnReason.GRINDSTONE, player);
|
||||||
|
+ // Paper end - Fire BlockExpEvent on grindstone use
|
||||||
}
|
}
|
||||||
|
|
||||||
world.levelEvent(1042, blockposition, 0);
|
world.levelEvent(1042, blockposition, 0);
|
||||||
@@ -113,6 +140,7 @@
|
@@ -113,6 +144,7 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
this.addStandardInventorySlots(playerInventory, 8, 84);
|
this.addStandardInventorySlots(playerInventory, 8, 84);
|
||||||
|
@ -94,7 +98,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -120,12 +148,14 @@
|
@@ -120,12 +152,14 @@
|
||||||
super.slotsChanged(inventory);
|
super.slotsChanged(inventory);
|
||||||
if (inventory == this.repairSlots) {
|
if (inventory == this.repairSlots) {
|
||||||
this.createResult();
|
this.createResult();
|
||||||
|
@ -110,7 +114,7 @@
|
||||||
this.broadcastChanges();
|
this.broadcastChanges();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,7 +248,7 @@
|
@@ -218,7 +252,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -119,7 +123,7 @@
|
||||||
super.removed(player);
|
super.removed(player);
|
||||||
this.access.execute((world, blockposition) -> {
|
this.access.execute((world, blockposition) -> {
|
||||||
this.clearContainer(player, this.repairSlots);
|
this.clearContainer(player, this.repairSlots);
|
||||||
@@ -226,12 +256,13 @@
|
@@ -226,12 +260,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Add table
Reference in a new issue