From 1684976a47fb033a28ea3b4a8bce072e096d5c69 Mon Sep 17 00:00:00 2001
From: xrgman <xrgman@gmail.com>
Date: Tue, 7 Apr 2015 12:13:40 +0200
Subject: [PATCH] fixed nullpointer

---
 Objects/DrawObject.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Objects/DrawObject.java b/Objects/DrawObject.java
index 22e5c7c..ccb0aec 100644
--- a/Objects/DrawObject.java
+++ b/Objects/DrawObject.java
@@ -190,8 +190,12 @@ public abstract class DrawObject
 	{
 		Shape ownShape = getRectangle();
 		Rectangle2D otherRectangle = object.getTransform().createTransformedShape(object.getImageRectangle()).getBounds2D();
-		if (ownShape.intersects(otherRectangle))
-			return true;
+		if(ownShape != null && otherRectangle != null) {
+			if (ownShape.intersects(otherRectangle))
+				return true;
+			else
+				return false;
+		}
 		else
 			return false;
 	}