Merge branch '1.12.2' into 4.3-dev

2020-04-14 17:41:33 +01:00
parent aecc8b0889 937617d7af
commit 91b2ee1a13
32 changed files with 869 additions and 1313 deletions
@@ -636,7 +636,7 @@ public final class WizardryUtilities {
 			// This is a perfect example of where you need to use .equals() and not ==. For most applications,
 			// this was unnoticeable until world reload because the UUID instance or entity instance is stored.
 			// Fixed now though.
-			if(entity.getUniqueID().equals(id)){
+			if(entity != null && entity.getUniqueID() != null && entity.getUniqueID().equals(id)){
 				return entity;
 			}
 		}