Fix apoli:attacker damage condition null

Dueris · Jul 20, 2024 · 4500323 · 4500323
1 parent 45e492b
commit 4500323
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/origins/src/main/java/me/dueris/originspaper/factory/conditions/types/DamageConditions.java b/origins/src/main/java/me/dueris/originspaper/factory/conditions/types/DamageConditions.java
@@ -48,6 +48,7 @@ public void registerConditions() {
 			return false;
 		}));
 		register(new ConditionFactory(OriginsPaper.apoliIdentifier("attacker"), (data, damageEvent) -> {
+			if (damageEvent.getDamageSource() == null || damageEvent.getDamageSource().getDirectEntity() == null) return false;
 			Entity attacker = new DamageSource(nmsDamageSource(damageEvent).typeHolder(), ((CraftEntity) damageEvent.getDamageSource().getDirectEntity()).getHandle()).getEntity();
 			if (attacker instanceof LivingEntity) {
 				return !data.isPresent("entity_condition") || ConditionExecutor.testEntity(data.getJsonObject("entity_condition"), attacker.getBukkitEntity());

diff --git a/origins/src/main/java/me/dueris/originspaper/util/LangFile.java b/origins/src/main/java/me/dueris/originspaper/util/LangFile.java
@@ -28,4 +28,7 @@ public ResourceLocation key() {
 		return this.key;
 	}
 
+	public Map<String, String> getLangMap() {
+		return langMap;
+	}
 }