Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-27 01:08:34 +01:00
Code Issues Projects Releases Wiki Activity

Fixed lenses of the killer not dropping player drops

Browse source 
Fixed batteries dupe bug
This commit is contained in:
Ellpeck 2016-11-23 18:38:13 +01:00
parent 483d20ff99
commit 691747d2f3
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBattery.java
View file

@ -59,12 +59,12 @@ public class ItemBattery extends ItemEnergy{
Item item = slot.getItem(); Item item = slot.getItem();
if(item instanceof IEnergyContainerItem){ if(item instanceof IEnergyContainerItem){
received = ((IEnergyContainerItem)item).receiveEnergy(slot, this.getEnergyStored(stack), false); received = ((IEnergyContainerItem)item).receiveEnergy(slot, this.extractEnergy(stack, Integer.MAX_VALUE, true), false);
} }
else if(ActuallyAdditions.teslaLoaded && slot.hasCapability(TeslaUtil.teslaConsumer, null)){ else if(ActuallyAdditions.teslaLoaded && slot.hasCapability(TeslaUtil.teslaConsumer, null)){
ITeslaConsumer cap = slot.getCapability(TeslaUtil.teslaConsumer, null); ITeslaConsumer cap = slot.getCapability(TeslaUtil.teslaConsumer, null);
if(cap != null){ if(cap != null){
received = (int)cap.givePower(this.getEnergyStored(stack), false); received = (int)cap.givePower(this.extractEnergy(stack, Integer.MAX_VALUE, true), false);
} }
} }

6
src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensEvenMoarDeath.java
View file

@ -13,6 +13,9 @@ package de.ellpeck.actuallyadditions.mod.items.lens;
import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.ModUtil;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.FakePlayerFactory;
import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.ReflectionHelper;
public class LensEvenMoarDeath extends LensDeath{ public class LensEvenMoarDeath extends LensDeath{
@ -20,6 +23,9 @@ public class LensEvenMoarDeath extends LensDeath{
@Override @Override
protected void onAttacked(EntityLivingBase entity, IAtomicReconstructor tile){ protected void onAttacked(EntityLivingBase entity, IAtomicReconstructor tile){
try{ try{
FakePlayer fake = FakePlayerFactory.getMinecraft((WorldServer)tile.getWorldObject());
ReflectionHelper.setPrivateValue(EntityLivingBase.class, entity, fake, 36);
ReflectionHelper.setPrivateValue(EntityLivingBase.class, entity, 100, 37); ReflectionHelper.setPrivateValue(EntityLivingBase.class, entity, 100, 37);
} }
catch(Exception e){ catch(Exception e){