From 6012086fa5a2593096bd2d39c2435f9ab169c901 Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Sun, 9 Oct 2011 23:45:46 +0200
Subject: Reverting ementalos change on freeze-afk, hopefully fixing the
 flickering.

---
 .../src/com/earth2me/essentials/EssentialsPlayerListener.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
index 5d121b82e..3d5851d93 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -95,9 +95,16 @@ public class EssentialsPlayerListener extends PlayerListener
 			final Location from = event.getFrom();
 			final Location to = event.getTo().clone();
 			to.setX(from.getX());
-			to.setY(from.getBlock().getTypeId() == 0 ? from.getY() - 1 : from.getY());
+			to.setY(from.getY());
 			to.setZ(from.getZ());
-			event.setTo(to);
+			try
+			{
+				event.setTo(Util.getSafeDestination(to));
+			}
+			catch (Exception ex)
+			{
+				event.setTo(to);
+			}
 			return;
 		}
 
-- 
cgit v1.2.3