Skip to content
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

Jump to bottom

Fixes players breaking playerheads to bypass persistentheads using water. Fixes #17 #18

Merged
merged 3 commits into from Mar 11, 2021
Merged

Fixes players breaking playerheads to bypass persistentheads using water. Fixes #17 #18

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9132b77
Prevents player from breaking heads via water.
JoelGodOfwar Jan 2, 2021
0f62253
More vanilla fix to water breaking heads
JoelGodOfwar Jan 22, 2021
58c548e
Keeps Head Name and Lore when broken with water
JoelGodOfwar Jan 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
68 changes: 68 additions & 0 deletions src/main/java/me/machinemaker/vanillatweaks/persistentheads/PersistentHeads.java
View file
Open in desktop
Expand Up @@ -76,6 +76,74 @@ public void onBlockDropItemEvent(BlockDropItemEvent event) {
}

}
/** Prevents player from removing playerhead NBT by water logging them */
@EventHandler()
public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
Block block = event.getBlock();
Location loc = block.getLocation();
@Nonnull BlockState blockState = block.getState();
Material blockType = blockState.getType();
if (blockType != Material.PLAYER_HEAD && blockType != Material.PLAYER_WALL_HEAD) return;
TileState skullState = (TileState) blockState;
@Nonnull PersistentDataContainer skullPDC = skullState.getPersistentDataContainer();
@Nullable String name = skullPDC.get(NAME_KEY, PersistentDataType.STRING);
@Nullable String[] lore = skullPDC.get(LORE_KEY, LORE_PDT);
if (name == null) return;
Collection<ItemStack> drops = block.getDrops();
ItemStack[] stackArray = drops.toArray(new ItemStack[0]);
@Nonnull ItemStack itemstack = stackArray[0];
if (itemstack.getType() == Material.PLAYER_HEAD) {
@Nullable ItemMeta meta = itemstack.getItemMeta();
if (meta == null) {
logWarn("meta=null");
return; // This shouldn't happen
}
meta.setDisplayName(name);
if (lore != null) meta.setLore(Arrays.asList(lore));
itemstack.setItemMeta(meta);

block.getWorld().dropItemNaturally(block.getLocation(), itemstack);
block.getDrops().clear();
block.setType(Material.AIR);
}

BlockState blockS = block.getWorld().getBlockAt(loc).getState();
blockS.update(true, true);
}

/** Prevents player from removing playerhead NBT using running water */
@EventHandler
public void onLiquidFlow(BlockFromToEvent event) {
Block block = event.getToBlock();
Location loc = block.getLocation();

@Nonnull BlockState blockState = block.getState();
Material blockType = blockState.getType();
if (blockType != Material.PLAYER_HEAD && blockType != Material.PLAYER_WALL_HEAD) return;
TileState skullState = (TileState) blockState;
@Nonnull PersistentDataContainer skullPDC = skullState.getPersistentDataContainer();
@Nullable String name = skullPDC.get(NAME_KEY, PersistentDataType.STRING);
@Nullable String[] lore = skullPDC.get(LORE_KEY, LORE_PDT);
if (name == null) return;
Collection<ItemStack> drops = block.getDrops();
ItemStack[] stackArray = drops.toArray(new ItemStack[0]);
@Nonnull ItemStack itemstack = stackArray[0];
if (itemstack.getType() == Material.PLAYER_HEAD) {
@Nullable ItemMeta meta = itemstack.getItemMeta();
if (meta == null) return; // This shouldn't happen
meta.setDisplayName(name);
if (lore != null) meta.setLore(Arrays.asList(lore));
itemstack.setItemMeta(meta);

block.getWorld().dropItemNaturally(block.getLocation(), itemstack);
block.getDrops().clear();
block.setType(Material.AIR);
event.setCancelled(true);
}

BlockState blockS = block.getWorld().getBlockAt(loc).getState();
blockS.update(true, true);
}

@Override
public void register() {
Expand Down