geforkt von Mirrors/Paper
50 Zeilen
3.1 KiB
Diff
50 Zeilen
3.1 KiB
Diff
From 956e8682b2cb78cd680675829030f6e3c8cc1bf7 Mon Sep 17 00:00:00 2001
|
|
From: Thinkofdeath <thinkofdeath@spigotmc.org>
|
|
Date: Thu, 26 Jun 2014 23:42:52 +0100
|
|
Subject: [PATCH] Add damager to the unhandled error
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 260c305..c1085a0 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -185,7 +185,7 @@ public class CraftEventFactory {
|
|
*/
|
|
public static PlayerInteractEvent callPlayerInteractEvent(EntityHuman who, Action action, ItemStack itemstack) {
|
|
if (action != Action.LEFT_CLICK_AIR && action != Action.RIGHT_CLICK_AIR) {
|
|
- throw new AssertionError(String.format("%s performing %s with %s", who, action, itemstack));
|
|
+ throw new IllegalArgumentException(String.format("%s performing %s with %s", who, action, itemstack)); // Spigot
|
|
}
|
|
return callPlayerInteractEvent(who, action, new BlockPosition(0, 256, 0), EnumDirection.SOUTH, itemstack);
|
|
}
|
|
@@ -482,7 +482,7 @@ public class CraftEventFactory {
|
|
if (source == DamageSource.CACTUS) {
|
|
cause = DamageCause.CONTACT;
|
|
} else {
|
|
- throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex));
|
|
+ throw new RuntimeException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.translationIndex)); // Spigot
|
|
}
|
|
EntityDamageEvent event = callEvent(new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
|
|
if (!event.isCancelled()) {
|
|
@@ -500,7 +500,7 @@ public class CraftEventFactory {
|
|
} else if (source == DamageSource.FALL) {
|
|
cause = DamageCause.FALL;
|
|
} else {
|
|
- throw new AssertionError(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.translationIndex));
|
|
+ throw new RuntimeException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.translationIndex)); // Spigot
|
|
}
|
|
EntityDamageEvent event = callEvent(new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions));
|
|
if (!event.isCancelled()) {
|
|
@@ -538,7 +538,7 @@ public class CraftEventFactory {
|
|
return callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions);
|
|
}
|
|
|
|
- throw new AssertionError(String.format("Unhandled damage of %s from %s", entity, source.translationIndex));
|
|
+ throw new RuntimeException(String.format("Unhandled damage of %s from %s", entity, source.translationIndex)); // Spigot
|
|
}
|
|
|
|
private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions) {
|
|
--
|
|
2.1.4
|
|
|