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

Fixed a null pointer exception with certain modded blocks with the Ritual of Magnetism (#1380)

Browse source 
* Replaced a null RayTraceResult in Magnetism Ritual with a real one

* Added a fake player to the code. No more passing nulls.
This commit is contained in:
KohaiKhaos 2018-08-07 18:24:41 -05:00 committed by Nick Ignoffo
parent e8ad057662
commit 7954d04421
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/WayofTime/bloodmagic/ritual/types/RitualMagnetic.java
View file

@ -7,9 +7,14 @@ import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.FakePlayerFactory;
import java.util.function.Consumer;
@ -18,6 +23,7 @@ public class RitualMagnetic extends Ritual {
public static final String PLACEMENT_RANGE = "placementRange";
// public static final String SEARCH_RANGE = "searchRange";
public BlockPos lastPos; // An offset
private FakePlayer fakePlayer;
public RitualMagnetic() {
super("ritualMagnetic", 0, 5000, "ritual." + BloodMagic.MODID + ".magneticRitual");
@ -28,6 +34,7 @@ public class RitualMagnetic extends Ritual {
@Override
public void performRitual(IMasterRitualStone masterRitualStone) {
World world = masterRitualStone.getWorldObj();
Vec3d MRSpos = new Vec3d(masterRitualStone.getBlockPos());
int currentEssence = masterRitualStone.getOwnerNetwork().getCurrentEssence();
if (currentEssence < getRefreshCost()) {
@ -68,8 +75,10 @@ public class RitualMagnetic extends Ritual {
while (i <= radius) {
while (k <= radius) {
BlockPos newPos = pos.add(i, j, k);
Vec3d newPosVector = new Vec3d(newPos);
IBlockState state = world.getBlockState(newPos);
ItemStack checkStack = state.getBlock().getPickBlock(state, null, world, newPos, null);
RayTraceResult fakeRayTrace = world.rayTraceBlocks(MRSpos, newPosVector, false);
ItemStack checkStack = state.getBlock().getPickBlock(state, fakeRayTrace, world, newPos, getFakePlayer((WorldServer) world));
if (isBlockOre(checkStack)) {
Utils.swapLocations(world, newPos, world, replacement);
masterRitualStone.getOwnerNetwork().syphon(masterRitualStone.ticket(getRefreshCost()));
@ -134,6 +143,10 @@ public class RitualMagnetic extends Ritual {
return new RitualMagnetic();
}
private FakePlayer getFakePlayer(WorldServer world) {
return fakePlayer == null ? fakePlayer = FakePlayerFactory.get(world, new GameProfile(null, BloodMagic.MODID + "_ritual_magnetic")) : fakePlayer;
}
public static boolean isBlockOre(ItemStack stack) {
if (stack.isEmpty())
return false;