lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed some black magic that occurred when a mob was summoned in a world that was loaded but didn't have a list entry that is supposed to be generated on world load. (#1618)

Browse source
This commit is contained in:
Tobias 2019-09-05 03:38:52 +02:00 committed by Nick Ignoffo
parent 6587068296
commit 3cdf4517a8
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/potion/PotionEventHandlers.java
View file

@ -3,6 +3,7 @@ package WayofTime.bloodmagic.potion;
import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.BloodMagic;
import WayofTime.bloodmagic.core.RegistrarBloodMagic; import WayofTime.bloodmagic.core.RegistrarBloodMagic;
import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent; import WayofTime.bloodmagic.event.SacrificeKnifeUsedEvent;
import com.google.common.collect.Lists;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IProjectile; import net.minecraft.entity.IProjectile;
@ -55,7 +56,7 @@ public class PotionEventHandlers {
@SubscribeEvent @SubscribeEvent
public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) { public static void onEntityUpdate(LivingEvent.LivingUpdateEvent event) {
EntityLivingBase eventEntityLiving = event.getEntityLiving(); EntityLivingBase eventEntityLiving = event.getEntityLiving();
List<EntityPlayer> flightList = flightListMap.get(eventEntityLiving.getEntityWorld()); List<EntityPlayer> flightList = flightListMap.getOrDefault(eventEntityLiving.getEntityWorld(), Lists.newArrayList());
if (eventEntityLiving instanceof EntityPlayer) { if (eventEntityLiving instanceof EntityPlayer) {
EntityPlayer player = (EntityPlayer) eventEntityLiving; EntityPlayer player = (EntityPlayer) eventEntityLiving;
@ -91,7 +92,7 @@ public class PotionEventHandlers {
// } // }
// } // }
// } // }
List<EntityLivingBase> noGravityList = noGravityListMap.get(event.getEntityLiving().getEntityWorld()); List<EntityLivingBase> noGravityList = noGravityListMap.getOrDefault(event.getEntityLiving().getEntityWorld(), Lists.newArrayList());
if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.SUSPENDED) && !eventEntityLiving.hasNoGravity()) { if (eventEntityLiving.isPotionActive(RegistrarBloodMagic.SUSPENDED) && !eventEntityLiving.hasNoGravity()) {
eventEntityLiving.setNoGravity(true); eventEntityLiving.setNoGravity(true);
noGravityList.add(eventEntityLiving); noGravityList.add(eventEntityLiving);

12
src/main/java/WayofTime/bloodmagic/util/handler/event/GenericHandler.java
View file

@ -555,11 +555,11 @@ public class GenericHandler {
@SubscribeEvent @SubscribeEvent
public static void onWorldUnload(WorldEvent.Unload event) { public static void onWorldUnload(WorldEvent.Unload event) {
World world = event.getWorld(); World world = event.getWorld();
bounceMapMap.getOrDefault(world, Collections.emptyMap()).clear(); bounceMapMap.remove(world);
filledHandMapMap.getOrDefault(world, Collections.emptyMap()).clear(); filledHandMapMap.remove(world);
attackTaskMapMap.getOrDefault(world, Collections.emptyMap()).clear(); attackTaskMapMap.remove(world);
targetTaskMapMap.getOrDefault(world, Collections.emptyMap()).clear(); targetTaskMapMap.remove(world);
PotionEventHandlers.flightListMap.getOrDefault(world, Collections.emptyList()).clear(); PotionEventHandlers.flightListMap.remove(world);
PotionEventHandlers.noGravityListMap.getOrDefault(world, Collections.emptyList()).clear(); PotionEventHandlers.noGravityListMap.remove(world);
} }
} }