kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

可能是真修复is导致的空判断异常

Browse source
This commit is contained in:
17146 2025-06-30 21:09:43 +08:00 • committed by Light_Quanta
parent 1831f900f6
commit afdb50c1d7
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/damage/DamageModify.java
View file

@ -122,8 +122,14 @@ public class DamageModify {
} }
return switch (sourceType) { return switch (sourceType) {
case TAG_KEY -> source.is(sourceTagKey); case TAG_KEY -> {
case RESOURCE_KEY -> source.is(sourceKey); if (sourceTagKey == null) yield false;
yield source.is(sourceTagKey);
}
case RESOURCE_KEY -> {
if (sourceKey == null) yield false;
yield source.is(sourceKey);
}
case FUNCTION -> condition.apply(source); case FUNCTION -> condition.apply(source);
case ENTITY_ID -> { case ENTITY_ID -> {
var directEntity = source.getDirectEntity(); var directEntity = source.getDirectEntity();
@ -141,7 +147,7 @@ public class DamageModify {
case ENTITY_TAG -> { case ENTITY_TAG -> {
var directEntity = source.getDirectEntity(); var directEntity = source.getDirectEntity();
if (directEntity == null) yield false; if (directEntity == null) yield false;
if (entityTag == null) yield false;
yield directEntity.getType().is(entityTag); yield directEntity.getType().is(entityTag);
} }
case ALL -> true; case ALL -> true;