Catch null events or players.

N3X15 · Apr 28, 2011 · 3465fa0 · 3465fa0
1 parent 001504a
commit 3465fa0
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/main/java/me/taylorkelly/bigbrother/listeners/BBPlayerListener.java b/src/main/java/me/taylorkelly/bigbrother/listeners/BBPlayerListener.java
@@ -53,6 +53,8 @@ public BBPlayerListener(BigBrother plugin) {
 	public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
 		try {
 			//plugin.processPsuedotick();
+			if(event==null || event.getPlayer()==null)
+				return;
 			Player player = event.getPlayer();
 			BBPlayerInfo pi = BBUsersTable.getInstance().getUserByName(player.getName());
 			plugin.closeChestIfOpen(pi);
@@ -69,7 +71,9 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
 	public void onPlayerJoin(PlayerJoinEvent event) {
 		try {
 			//plugin.processPsuedotick();
-			final Player player = event.getPlayer();
+			if(event==null || event.getPlayer()==null)
+				return;
+			Player player = event.getPlayer();
 
 			BBUsersTable.getInstance().addOrUpdateUser(player);
 			BBPlayerInfo pi = BBUsersTable.getInstance().getUserByName(player.getName());
@@ -101,6 +105,8 @@ public void onPlayerJoin(PlayerJoinEvent event) {
 	public void onPlayerQuit(PlayerQuitEvent event) {
 		try {
 			//plugin.processPsuedotick();
+			if(event==null || event.getPlayer()==null)
+				return;
 			final Player player = event.getPlayer();
 			BBPlayerInfo pi = BBUsersTable.getInstance().getUserByName(player.getName());
 			plugin.closeChestIfOpen(pi);
@@ -117,6 +123,8 @@ public void onPlayerQuit(PlayerQuitEvent event) {
 	public void onPlayerTeleport(PlayerTeleportEvent event) {
 		try {
 			//plugin.processPsuedotick();
+			if(event==null || event.getPlayer()==null)
+				return;
 			Location from = event.getFrom();
 			Location to = event.getTo();
 
@@ -136,6 +144,8 @@ public void onPlayerTeleport(PlayerTeleportEvent event) {
 	public void onPlayerChat(PlayerChatEvent event) {
 		try {
 			//plugin.processPsuedotick();
+			if(event==null || event.getPlayer()==null)
+				return;
 			final Player player = event.getPlayer();
 			BBPlayerInfo pi = BBUsersTable.getInstance().getUserByName(player.getName());
 			plugin.closeChestIfOpen(pi);
@@ -151,6 +161,8 @@ public void onPlayerChat(PlayerChatEvent event) {
 	@Override
 	public void onPlayerPickupItem(PlayerPickupItemEvent event) {
 		try {
+			if(event==null || event.getPlayer()==null)
+				return;
 			final Player player = event.getPlayer();
 			BBPlayerInfo pi = BBUsersTable.getInstance().getUserByName(player.getName());
 			if (BBSettings.pickupItem && pi.getWatched()) {
@@ -169,6 +181,8 @@ public void onPlayerPickupItem(PlayerPickupItemEvent event) {
 	@Override
 	public void onPlayerDropItem(PlayerDropItemEvent event) {
 		try {
+			if(event==null || event.getPlayer()==null)
+				return;
 			final Player player = event.getPlayer();
 			BBPlayerInfo pi = BBUsersTable.getInstance().getUserByName(player.getName());
 			if (BBSettings.dropItem && pi.getWatched()) {
@@ -183,6 +197,8 @@ public void onPlayerDropItem(PlayerDropItemEvent event) {
 	@Override
 	public void onPlayerInteract(PlayerInteractEvent event) {
 		try {
+			if(event==null || event.getPlayer()==null)
+				return;
 			//plugin.processPsuedotick();
 			if(event.isCancelled()) return;