Set blockdata when removing chorus fruit

Closes #799
This commit is contained in:
RoboMWM 2020-05-28 21:25:34 -07:00
parent 64e101c3bf
commit 110b068ac1

View File

@ -18,11 +18,6 @@
package me.ryanhamshire.GriefPrevention; package me.ryanhamshire.GriefPrevention;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.GameMode; import org.bukkit.GameMode;
@ -65,6 +60,11 @@ import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.metadata.MetadataValue; import org.bukkit.metadata.MetadataValue;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.UUID;
//event handlers related to blocks //event handlers related to blocks
public class BlockEventHandler implements Listener public class BlockEventHandler implements Listener
{ {
@ -840,7 +840,7 @@ public class BlockEventHandler implements Listener
if (shooter == null) if (shooter == null)
{ {
event.getHitBlock().setType(Material.AIR); event.getHitBlock().setType(Material.AIR);
Bukkit.getScheduler().runTask(GriefPrevention.instance, () -> event.getHitBlock().setType(Material.CHORUS_FLOWER)); Bukkit.getScheduler().runTask(GriefPrevention.instance, () -> event.getHitBlock().setBlockData(block.getBlockData()));
return; return;
} }
@ -849,7 +849,7 @@ public class BlockEventHandler implements Listener
if (allowContainer != null) if (allowContainer != null)
{ {
event.getHitBlock().setType(Material.AIR); event.getHitBlock().setType(Material.AIR);
Bukkit.getScheduler().runTask(GriefPrevention.instance, () -> event.getHitBlock().setType(Material.CHORUS_FLOWER)); Bukkit.getScheduler().runTask(GriefPrevention.instance, () -> event.getHitBlock().setBlockData(block.getBlockData()));
GriefPrevention.sendMessage(shooter, TextMode.Err, allowContainer); GriefPrevention.sendMessage(shooter, TextMode.Err, allowContainer);
return; return;
} }