Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-10 17:31:32 +01:00
Code Issues Projects Releases Wiki Activity

Fixes Lava Duplication Glitch (#1964)

Browse Source 
Due to the fact, that Obsidian Scooping uses one tick delay to remove obsidian, a player with a bucket in hand and offhand duplicated lava. 
To avoid that, added an extra check that ignores the interact event if a player holds a bucket in both hands, and interacted hand is offhand.

Fixes #1963
This commit is contained in:
BONNe 2022-04-11 08:13:12 +03:00 committed by GitHub
parent 4341c28aca
commit 9f163f0572
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java
View File

@ -15,6 +15,7 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
@ -54,6 +55,16 @@ public class ObsidianScoopingListener extends FlagListener {
|| e.getClickedBlock().getRelative(e.getBlockFace()).getType().equals(Material.WATER)) { || e.getClickedBlock().getRelative(e.getBlockFace()).getType().equals(Material.WATER)) {
return false; return false;
} }
if (Material.BUCKET.equals(e.getPlayer().getInventory().getItemInOffHand().getType()) &&
Material.BUCKET.equals(e.getPlayer().getInventory().getItemInMainHand().getType()) &&
EquipmentSlot.OFF_HAND.equals(e.getHand()))
{
// If player is holding bucket in both hands, then allow to interact only with main hand.
// Prevents lava duplication glitch.
return false;
}
return lookForLava(e); return lookForLava(e);
} }