Skip to content

fix cauldron dupe exploit #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Thorinwasher merged 1 commit into from
Apr 26, 2025
Merged

fix cauldron dupe exploit #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions bukkit/src/main/java/dev/jsinco/brewery/bukkit/listeners/PlayerEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.*;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
Expand Down Expand Up @@ -141,13 +142,17 @@ private void handleCauldron(PlayerInteractEvent event, @NotNull Block block) {
return;
}
if (isIngredient(itemStack)) {
handleIngredientAddition(itemStack, block, cauldronOptional.orElse(null), event.getPlayer());
boolean addedIngredient = handleIngredientAddition(itemStack, block, cauldronOptional.orElse(null), event.getPlayer(), event.getHand());
if (addedIngredient) {
event.setUseInteractedBlock(Event.Result.DENY);
event.setUseItemInHand(Event.Result.DENY);
}
}
if (itemStack.getType() == Material.GLASS_BOTTLE) {
cauldronOptional
.map(BukkitCauldron::extractBrew)
.ifPresent(brewItemStack -> {
event.getPlayer().getInventory().setItemInMainHand(decreaseItem(itemStack, event.getPlayer()));
updateHeldItem(decreaseItem(itemStack, event.getPlayer()), event.getPlayer(), event.getHand());
event.getPlayer().getWorld().dropItem(event.getPlayer().getLocation(), brewItemStack);
if (BukkitCauldron.decrementLevel(block)) {
ListenerUtil.removeActiveSinglePositionStructure(cauldronOptional.get(), breweryRegistry, database);
Expand All @@ -164,21 +169,33 @@ private void handleCauldron(PlayerInteractEvent event, @NotNull Block block) {
});
}

private void handleIngredientAddition(ItemStack itemStack, Block block, @Nullable BukkitCauldron cauldron, Player player) {
private boolean handleIngredientAddition(ItemStack itemStack, Block block, @Nullable BukkitCauldron cauldron, Player player, @Nullable EquipmentSlot hand) {
if (block.getType() == Material.CAULDRON && itemStack.getType() != Material.POTION) {
return;
return false;
}
if (cauldron == null) {
cauldron = this.initCauldron(block);
}
if (cauldron.addIngredient(itemStack, player)) {
player.getInventory().setItemInMainHand(decreaseItem(itemStack, player));
boolean addedIngredient = cauldron.addIngredient(itemStack, player);
if (addedIngredient) {
updateHeldItem(decreaseItem(itemStack, player), player, hand);
try {
database.updateValue(BukkitCauldronDataType.INSTANCE, cauldron);
} catch (PersistenceException e) {
e.printStackTrace();
}
}
return addedIngredient;
}

private void updateHeldItem(ItemStack item, Player player, EquipmentSlot equipmentSlot) {
if (equipmentSlot == EquipmentSlot.HAND) {
player.getInventory().setItemInMainHand(item);
} else if (equipmentSlot == EquipmentSlot.OFF_HAND) {
player.getInventory().setItemInOffHand(item);
} else {
throw new IllegalArgumentException("Only main hand and offhand equipment slots are allowed: " + equipmentSlot);
}
}

private BukkitCauldron initCauldron(Block block) {
Expand Down