Fix World Capabilities NPE when there are no attached capabilities.

This commit is contained in:
LexManos committed 2016-08-14 01:48:41 -07:00
1 parent bfddcfb4fc
commit 0e286f880e
4 files changed
+24 -20

No files matched your search

@@ -74,8 +74,11 @@ public class NoBedSleepingTest
public static class EventHandler
{
@SubscribeEvent
public void onEntityConstruct(AttachCapabilitiesEvent evt)
public void onEntityConstruct(AttachCapabilitiesEvent.Entity evt)
{
if (!(evt.getEntity() instanceof EntityPlayer))
return;
evt.addCapability(new ResourceLocation(MODID, "IExtraSleeping"), new ICapabilitySerializable<NBTPrimitive>()
{
IExtraSleeping inst = SLEEP_CAP.getDefaultInstance();
@@ -1,16 +1,9 @@
package net.minecraftforge.test;
import java.util.Map;
import java.util.Set;
import com.google.common.collect.Maps;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagIntArray;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.storage.WorldInfo;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.Capability.IStorage;
@@ -44,7 +37,8 @@ public class WorldCapabilityRainTimerTest {
@SubscribeEvent
public void attatchTimer(AttachCapabilitiesEvent.World event)
{
event.addCapability(new ResourceLocation(MODID, "rainTimer"), new RainTimerProvider());
if (!event.getWorld().isRemote && !event.getWorld().provider.getHasNoSky())
event.addCapability(new ResourceLocation(MODID, "rainTimer"), new RainTimerProvider());
}
@SubscribeEvent
@@ -55,18 +49,22 @@ public class WorldCapabilityRainTimerTest {
IRainTimer timer = event.world.getCapability(TIMER_CAP, null);
if(event.phase == TickEvent.Phase.END)
if (timer == null)
return;
if (event.phase == TickEvent.Phase.END)
timer.onTick();
if(event.phase == TickEvent.Phase.START)
if (event.phase == TickEvent.Phase.START)
{
if(!event.world.provider.getHasNoSky() && event.world.isRaining())
if(event.world.isRaining())
{
if(timer.getDuration() == 0)
if (timer.getDuration() == 0)
timer.refreshTimer(1000, 0);
else if(timer.isTimerReachedDuration())
else if (timer.isTimerReachedDuration())
event.world.provider.resetRainAndThunder();
} else
}
else
timer.refreshTimer(0, 0);
}
}