Fix NPE at World.java:448

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · Jul 11, 2013 · 4d9fb28 · 4d9fb28
1 parent 7a8134c
commit 4d9fb28
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/common/nallar/patched/world/PatchWorld.java b/src/common/nallar/patched/world/PatchWorld.java
@@ -442,10 +442,11 @@ public void updateEntityWithOptionalForce(Entity entity, boolean notForced) {
 			this.theProfiler.endSection();
 
 			if (notForced && entity.addedToChunk && entity.riddenByEntity != null) {
-				if (!entity.riddenByEntity.isDead && entity.riddenByEntity.ridingEntity == entity) {
-					this.updateEntity(entity.riddenByEntity);
+				Entity riddenByEntity = entity.riddenByEntity;
+				if (!riddenByEntity.isDead && riddenByEntity.ridingEntity == entity) {
+					this.updateEntity(riddenByEntity);
 				} else {
-					entity.riddenByEntity.ridingEntity = null;
+					riddenByEntity.ridingEntity = null;
 					entity.riddenByEntity = null;
 				}
 			}