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

Fixed lava crystal working even if there is no LP available. Causes a desync on server worlds.

Browse source
This commit is contained in:
WayofTime 2016-02-15 08:11:18 -05:00
parent 18a36b9778
commit 8ec653b2a7
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.txt
View file

@ -13,6 +13,8 @@ Version 2.0.0-17
- Ender Severance - Ender Severance
- Haste - Haste
- Dagger now bypasses checks of armour - Dagger now bypasses checks of armour
- Fixed issue with lava crystal working even their is no LP available.
- Added upgrade trainer
------------------------------------------------------ ------------------------------------------------------
Version 2.0.0-16 Version 2.0.0-16

5
src/main/java/WayofTime/bloodmagic/api/util/helper/NetworkHelper.java
View file

@ -32,6 +32,11 @@ public class NetworkHelper
public static SoulNetwork getSoulNetwork(String name) public static SoulNetwork getSoulNetwork(String name)
{ {
World world = DimensionManager.getWorld(0); World world = DimensionManager.getWorld(0);
if (world == null || world.getMapStorage() == null) //Hack-ish way to fix the lava crystal.
{
return new SoulNetwork(name);
}
SoulNetwork network = (SoulNetwork) world.getMapStorage().loadData(SoulNetwork.class, name); SoulNetwork network = (SoulNetwork) world.getMapStorage().loadData(SoulNetwork.class, name);
if (network == null) if (network == null)

10
src/main/java/WayofTime/bloodmagic/item/ItemLavaCrystal.java
View file

@ -51,10 +51,12 @@ public class ItemLavaCrystal extends ItemBindable implements IFuelHandler
if (fuelItem instanceof ItemLavaCrystal) if (fuelItem instanceof ItemLavaCrystal)
{ {
if (FMLCommonHandler.instance().getSide() == Side.CLIENT) System.out.println("Test get burn time: Side = " + FMLCommonHandler.instance().getSide());
{ //
return 200; // if (FMLCommonHandler.instance().getSide() == Side.CLIENT)
} // {
// return 200;
// }
if (canSyphonFromNetwork(fuel, getLPUsed())) if (canSyphonFromNetwork(fuel, getLPUsed()))
{ {