v1.4.1
This commit is contained in:
1 parent
c00712eed9
commit
fe7843b08a
1 file changed
+12
-3
@@ -24,7 +24,10 @@ public class EffectLogicHandler {
|
|||||||
public static void onEffectAdded(MobEffectEvent.Added event) {
|
public static void onEffectAdded(MobEffectEvent.Added event) {
|
||||||
LivingEntity entity = event.getEntity();
|
LivingEntity entity = event.getEntity();
|
||||||
MobEffectInstance instance = event.getEffectInstance();
|
MobEffectInstance instance = event.getEffectInstance();
|
||||||
Holder<MobEffect> currentEffect = instance.getEffect();
|
Holder<MobEffect> currentEffect = null;
|
||||||
|
if(instance != null) {
|
||||||
|
currentEffect = instance.getEffect();
|
||||||
|
}
|
||||||
if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) {
|
if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) {
|
||||||
if(entity.level() instanceof ServerLevel serverLevel) {
|
if(entity.level() instanceof ServerLevel serverLevel) {
|
||||||
serverLevel.getChunkSource().broadcast(entity,
|
serverLevel.getChunkSource().broadcast(entity,
|
||||||
@@ -37,7 +40,10 @@ public class EffectLogicHandler {
|
|||||||
public static void onEffectRemoved(MobEffectEvent.Remove event) {
|
public static void onEffectRemoved(MobEffectEvent.Remove event) {
|
||||||
LivingEntity entity = event.getEntity();
|
LivingEntity entity = event.getEntity();
|
||||||
MobEffectInstance instance = event.getEffectInstance();
|
MobEffectInstance instance = event.getEffectInstance();
|
||||||
Holder<MobEffect> currentEffect = instance.getEffect();
|
Holder<MobEffect> currentEffect = null;
|
||||||
|
if(instance != null) {
|
||||||
|
currentEffect = instance.getEffect();
|
||||||
|
}
|
||||||
if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) {
|
if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) {
|
||||||
if(entity.level() instanceof ServerLevel serverLevel) {
|
if(entity.level() instanceof ServerLevel serverLevel) {
|
||||||
if(event.getEffectInstance() != null) {
|
if(event.getEffectInstance() != null) {
|
||||||
@@ -52,7 +58,10 @@ public class EffectLogicHandler {
|
|||||||
public static void onEffectExpired(MobEffectEvent.Expired event) {
|
public static void onEffectExpired(MobEffectEvent.Expired event) {
|
||||||
LivingEntity entity = event.getEntity();
|
LivingEntity entity = event.getEntity();
|
||||||
MobEffectInstance instance = event.getEffectInstance();
|
MobEffectInstance instance = event.getEffectInstance();
|
||||||
Holder<MobEffect> currentEffect = instance.getEffect();
|
Holder<MobEffect> currentEffect = null;
|
||||||
|
if(instance != null) {
|
||||||
|
currentEffect = instance.getEffect();
|
||||||
|
}
|
||||||
if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) {
|
if(checkEffect(currentEffect) && !entity.level().isClientSide() && !(entity instanceof Player)) {
|
||||||
if(entity.level() instanceof ServerLevel serverLevel) {
|
if(entity.level() instanceof ServerLevel serverLevel) {
|
||||||
if(event.getEffectInstance() != null) {
|
if(event.getEffectInstance() != null) {
|
||||||
|
|||||||
Reference in new issue
Block a user