Theoretical fix for #4480.

BuildCraft · Aug 31, 2019 · b76c9bc · b76c9bc
1 parent 72262b6
commit b76c9bc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/BuildCraftAPI b/BuildCraftAPI
diff --git a/buildcraft_resources/changelog/7.99.24.3 b/buildcraft_resources/changelog/7.99.24.3
@@ -2,4 +2,4 @@ Bug fixes:
 
 * [#4468] Stopped buildcraft tiles from uselessly logging that the *client* lacked ownership information (despite ownership only being used on the server).
 * [#4471] Fixed a crash when spawning block breaking particles in an invalid state.
-* [#4472] Add frame and mining box validation checks when the quarry is read from NBT. 
+* [#4472] Add frame and mining box validation checks when the quarry is read from NBT.
diff --git a/common/buildcraft/energy/generation/OilGenerator.java b/common/buildcraft/energy/generation/OilGenerator.java
@@ -21,6 +21,7 @@
 import buildcraft.lib.misc.VecUtil;
 import buildcraft.lib.misc.data.Box;
 
+import buildcraft.core.BCCoreBlocks;
 import buildcraft.energy.BCEnergyConfig;
 import buildcraft.energy.generation.OilGenStructure.GenByPredicate;
 import buildcraft.energy.generation.OilGenStructure.ReplaceType;
@@ -189,7 +190,9 @@ public static List<OilGenStructure> getStructures(World world, int cx, int cz) {
             // Generate a spring at the very bottom
             if (type == GenType.LARGE) {
                 structures.add(createTube(new BlockPos(x, 1, z), wellY, radius, Axis.Y));
-                structures.add(createSpring(new BlockPos(x, 0, z)));
+                if (BCCoreBlocks.spring!= null) {
+                    structures.add(createSpring(new BlockPos(x, 0, z)));
+                }
             }
         }
         return structures;

diff --git a/common/buildcraft/lib/tile/TileBC_Neptune.java b/common/buildcraft/lib/tile/TileBC_Neptune.java
@@ -325,8 +325,9 @@ public void onPlacedBy(EntityLivingBase placer, ItemStack stack) {
     public void onPlayerOpen(EntityPlayer player) {
         if (owner == null) {
             owner = player.getGameProfile();
-            if (!owner.isComplete()) {
-                throw new IllegalArgumentException("Incomplete owner! ( " + player + " -> " + owner + " )");
+            if (owner.getId() == null) {
+                // Basically everything relies on the UUID
+                throw new IllegalArgumentException("No UUID for owner! ( " + player.getClass() + " " + player + " -> " + owner + " )");
             }
         }
         sendNetworkUpdate(NET_GUI_DATA, player);