mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-27 19:09:22 +00:00
65 lines
3.5 KiB
Diff
65 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: wangxyper <wangxyper@163.com>
|
|
Date: Sun, 15 Jan 2023 09:58:00 +0800
|
|
Subject: [PATCH] Hearse: Misc changes
|
|
|
|
Original license: MIT
|
|
Original project: https://github.com/Era4FunMC/Hearse
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 6a52ae70b5f7fd9953b6b2605cae722f606e7fec..f7bac0b1ad201a34cb70ef64a1c1f5b7439f30b5 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -2,7 +2,6 @@ package org.bukkit.craftbukkit.event;
|
|
|
|
import com.google.common.base.Function;
|
|
import com.google.common.base.Functions;
|
|
-import com.google.common.collect.Lists;
|
|
import com.mojang.datafixers.util.Either;
|
|
import java.net.InetAddress;
|
|
import java.util.ArrayList;
|
|
@@ -57,6 +56,7 @@ import net.minecraft.world.phys.BlockHitResult;
|
|
import net.minecraft.world.phys.EntityHitResult;
|
|
import net.minecraft.world.phys.HitResult;
|
|
import net.minecraft.world.phys.Vec3;
|
|
+import org.apache.logging.log4j.LogManager;
|
|
import org.bukkit.Bukkit;
|
|
import org.bukkit.Location; // Paper
|
|
import org.bukkit.Material;
|
|
@@ -1048,7 +1048,8 @@ public class CraftEventFactory {
|
|
} else if (source == DamageSource.IN_FIRE) {
|
|
cause = DamageCause.FIRE;
|
|
} else {
|
|
- throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.msgId));
|
|
+ cause = DamageCause.CUSTOM;
|
|
+ LogManager.getLogger().warn(String.format("Unhandled damage of %s by %s from %s", entity, damager, source.msgId));
|
|
}
|
|
EntityDamageEvent event = new EntityDamageByBlockEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions);
|
|
event.setCancelled(cancelled);
|
|
@@ -1078,7 +1079,8 @@ public class CraftEventFactory {
|
|
} else if (source == DamageSource.MAGIC) {
|
|
cause = DamageCause.MAGIC;
|
|
} else {
|
|
- throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.msgId));
|
|
+ LogManager.getLogger().error(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.msgId));
|
|
+ cause = DamageCause.CUSTOM;
|
|
}
|
|
EntityDamageEvent event = new EntityDamageByEntityEvent(damager, entity.getBukkitEntity(), cause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
|
|
event.setCancelled(cancelled);
|
|
@@ -1124,11 +1126,12 @@ public class CraftEventFactory {
|
|
cause = DamageCause.CUSTOM;
|
|
}
|
|
|
|
- if (cause != null) {
|
|
- return CraftEventFactory.callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
|
|
+ if (cause == null) {
|
|
+ LogManager.getLogger().warn(String.format("Unhandled damage of %s from %s", entity, source.msgId));
|
|
+ cause = DamageCause.CUSTOM;
|
|
}
|
|
|
|
- throw new IllegalStateException(String.format("Unhandled damage of %s from %s", entity, source.msgId));
|
|
+ return CraftEventFactory.callEntityDamageEvent(null, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
|
|
}
|
|
|
|
@Deprecated // Paper - Add critical damage API
|