Cleanup last commit.

This commit is contained in:
wizjany 2019-03-28 23:07:48 -04:00
parent 8a3f066023
commit e2ffab5ee8
2 changed files with 10 additions and 9 deletions

View File

@ -63,7 +63,7 @@ public void onPlaceBlock(PlaceBlockEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("PLACE");
builder.append(" ");
builder.append("").append(event.getEffectiveMaterial());
builder.append(event.getEffectiveMaterial());
builder.append(" ");
builder.append("@").append(toBlockString(event.getBlocks()));
builder.append(" ");
@ -81,7 +81,7 @@ public void onBreakBlock(BreakBlockEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("DIG");
builder.append(" ");
builder.append("").append(event.getEffectiveMaterial());
builder.append(event.getEffectiveMaterial());
builder.append(" ");
builder.append("[").append(event.getCause()).append("]");
builder.append(" ");
@ -99,14 +99,14 @@ public void onUseBlock(UseBlockEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("INTERACT");
builder.append(" ");
builder.append("").append(event.getEffectiveMaterial());
builder.append(event.getEffectiveMaterial());
builder.append(" ");
builder.append("[").append(event.getCause()).append("]");
builder.append(" ");
builder.append("@").append(toBlockString(event.getBlocks()));
builder.append(" ");
builder.append(": ").append(getEventName(event.getOriginalEvent()));
if (event.getOriginalEvent() instanceof org.bukkit.event.player.PlayerInteractEvent) {
if (event.getOriginalEvent() instanceof PlayerInteractEvent) {
builder.append(".").append(((PlayerInteractEvent) event.getOriginalEvent()).getAction());
}
if (event.getResult() != Result.DEFAULT) {
@ -120,7 +120,7 @@ public void onSpawnEntity(SpawnEntityEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("SPAWN");
builder.append(" ");
builder.append("").append(event.getEffectiveType());
builder.append(event.getEffectiveType());
builder.append(" ");
builder.append("[").append(event.getCause()).append("]");
builder.append(" ");
@ -138,7 +138,7 @@ public void onDestroyEntity(DestroyEntityEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("DESTROY");
builder.append(" ");
builder.append("").append(event.getEntity().getType());
builder.append(event.getEntity().getType());
builder.append(" ");
builder.append("[").append(event.getCause()).append("]");
builder.append(" ");
@ -156,7 +156,7 @@ public void onUseEntity(UseEntityEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("INTERACT");
builder.append(" ");
builder.append("").append(event.getEntity().getType());
builder.append(event.getEntity().getType());
builder.append(" ");
builder.append("[").append(event.getCause()).append("]");
builder.append(" ");
@ -174,7 +174,7 @@ public void onDamageEntity(DamageEntityEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("DAMAGE");
builder.append(" ");
builder.append("").append(event.getEntity().getType());
builder.append(event.getEntity().getType());
builder.append(" ");
builder.append("[").append(event.getCause()).append("]");
builder.append(" ");
@ -192,7 +192,7 @@ public void onUseItem(UseItemEvent event) {
StringBuilder builder = new StringBuilder();
builder.append("USE");
builder.append(" ");
builder.append("").append(event.getItemStack().getType());
builder.append(event.getItemStack().getType());
builder.append(" ");
builder.append("[").append(event.getCause()).append("]");
builder.append(" ");

View File

@ -412,6 +412,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
// turtle eggs are broken when this happens
if (clicked.getType() == Material.TURTLE_EGG) { // normally we'd be safe but WG7 is 1.13+ only
entityBreakBlockDebounce.debounce(clicked, player, event, new BreakBlockEvent(event, cause, clicked));
break;
}
// Forget about Redstone ore