Skip to content

Commit ede2e5d

Browse files
committed
Fix #3, don't pick up liquid in BucketMob.
Buckets no longer trigger BucketFillEvent if they are a Bucket Mob.
1 parent 3716bbf commit ede2e5d

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

src/main/java/adhdmc/simplebucketmobs/listener/BucketMob.java

+11
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.bukkit.event.EventPriority;
2020
import org.bukkit.event.Listener;
2121
import org.bukkit.event.entity.CreatureSpawnEvent;
22+
import org.bukkit.event.player.PlayerBucketFillEvent;
2223
import org.bukkit.event.player.PlayerInteractEntityEvent;
2324
import org.bukkit.event.player.PlayerInteractEvent;
2425
import org.bukkit.inventory.EquipmentSlot;
@@ -125,6 +126,16 @@ public void unbucketMob(PlayerInteractEvent event) {
125126
}
126127
}
127128

129+
@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
130+
public void noBucketLiquid(PlayerBucketFillEvent event) {
131+
Player player = event.getPlayer();
132+
ItemStack bucket = player.getEquipment().getItem(event.getHand());
133+
if (bucket.getItemMeta().getPersistentDataContainer().has(mobNBTKey)) {
134+
event.setCancelled(true);
135+
}
136+
// TODO: Make it so that when performing bucketMob and unbucketMob, the bucket does not collect liquid.
137+
}
138+
128139
/**
129140
* Serializes the NBT Data from the LivingEntity.
130141
* @param e LivingEntity

0 commit comments

Comments
 (0)