Merge branch 'breaking' into UntrustedVisit

This commit is contained in:
mindw0rm
2019-10-22 17:21:24 +02:00
4 changed files with 11 additions and 10 deletions

View File

@ -2046,13 +2046,14 @@ import java.util.regex.Pattern;
if (type == Material.AIR) {
type = offType;
}
// in the following, lb needs to have the material of the item in hand i.e. type
lb = new BukkitLazyBlock(PlotBlock.get(type.toString()));
if (type.isBlock()) {
location = BukkitUtil
.getLocation(block.getRelative(event.getBlockFace()).getLocation());
eventType = PlayerBlockEventType.PLACE_BLOCK;
break;
}
lb = new BukkitLazyBlock(PlotBlock.get(type.toString()));
if (type.toString().toLowerCase().endsWith("egg")) {
eventType = PlayerBlockEventType.SPAWN_MOB;
} else {