Merge branch '1.12.2' into 1.12.2-dev

src/main/java/electroblob/wizardry/util/WizardryUtilities.java

@@ -101,6 +101,26 @@ public final class WizardryUtilities {
 	// SECTION Block/Entity/World Utilities
 	// ===============================================================================================================
 
+	/**
+	 * Returns the actual light level, taking natural light (skylight) and artificial light (block light) into account.
+	 * This uses the same logic as mob spawning.
+	 * 
+	 * @return The light level, from 0 (pitch darkness) to 15 (full daylight/at a torch).
+	 */
+	public static int getLightLevel(World world, BlockPos pos){
+		
+		int i = world.getLightFromNeighbors(pos);
+
+        if(world.isThundering()){
+            int j = world.getSkylightSubtracted();
+            world.setSkylightSubtracted(10);
+            i = world.getLightFromNeighbors(pos);
+            world.setSkylightSubtracted(j);
+        }
+
+        return i;
+	}
+	
 	/**
 	 * Returns whether the block at the given coordinates can be replaced by another one (works as if a block is being
 	 * placed by a player). True for air, liquids, vines, tall grass and snow layers but not for flowers, signs etc.
@@ -945,7 +965,7 @@ public final class WizardryUtilities {
 	 * 
 	 * @return False under any of the following circumstances, true otherwise:
 	 *         <p>
-	 *         - Either entity is null
+	 *         - The target is null
 	 *         <p>
 	 *         - The target is the attacker (this isn't as stupid as it sounds - anything with an AoE might cause this
 	 *         to be true, as can summoned creatures)
@@ -954,10 +974,18 @@ public final class WizardryUtilities {
 	 *         attacker need not be an ally of the target)
 	 *         <p>
 	 *         - The target is a creature that was summoned/controlled by the attacker or by an ally of the attacker.
+	 *         <p>
+	 *         <i>As of wizardry 4.1.2, this method now returns <b>true</b> instead of false if the attacker is null. This
+	 *         is because in the vast majority of cases, it makes more sense this way: if a construct has no caster, it
+	 *         should affect all entities; if a minion has no caster is should target all entities; etc.</i>
 	 */
 	public static boolean isValidTarget(Entity attacker, Entity target){
 
-		if(attacker == null || target == null) return false;
+		// Always return true if the attacker is null
+		if(attacker == null) return true;
+		
+		// Always return false if the target is null
+		if(target == null) return false;
 
 		// Tests whether the target is the attacker
 		if(target == attacker) return false;