From f7fd00760271d05430a1cca580d6b93a23da75a6 Mon Sep 17 00:00:00 2001
From: Marc Baloup <marc.baloup@laposte.net>
Date: Mon, 24 Nov 2014 10:43:23 +0100
Subject: [PATCH] Correction de bug : On pouvait sortir d'AFK en se faisant
 pousser par un piston

---
 make_jar.jardesc                                           | 2 +-
 resources/plugin.yml                                       | 2 +-
 .../java/plugin/pandacraftutils/afk/CommandAfk.java        | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/make_jar.jardesc b/make_jar.jardesc
index 210127e..d92d8c8 100644
--- a/make_jar.jardesc
+++ b/make_jar.jardesc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <jardesc>
-    <jar path="PandacraftUtils/jar_export/PandacraftUtils-2.2.jar"/>
+    <jar path="PandacraftUtils/jar_export/PandacraftUtils-2.2.1.jar"/>
     <options buildIfNeeded="true" compress="true" descriptionLocation="/PandacraftUtils/make_jar.jardesc" exportErrors="true" exportWarnings="true" includeDirectoryEntries="false" overwrite="false" saveDescription="true" storeRefactorings="false" useSourceFolders="false"/>
     <storedRefactorings deprecationInfo="true" structuralOnly="false"/>
     <selectedProjects/>
diff --git a/resources/plugin.yml b/resources/plugin.yml
index df56482..55e257d 100644
--- a/resources/plugin.yml
+++ b/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: PandacraftUtils
 main: net.mc_pandacraft.java.plugin.pandacraftutils.PandacraftUtils
-version: 2.2
+version: 2.2.1
 
 
 
diff --git a/src/net/mc_pandacraft/java/plugin/pandacraftutils/afk/CommandAfk.java b/src/net/mc_pandacraft/java/plugin/pandacraftutils/afk/CommandAfk.java
index 2fc8730..8bb0a72 100644
--- a/src/net/mc_pandacraft/java/plugin/pandacraftutils/afk/CommandAfk.java
+++ b/src/net/mc_pandacraft/java/plugin/pandacraftutils/afk/CommandAfk.java
@@ -264,7 +264,12 @@ public class CommandAfk extends BukkitRunnable implements CommandExecutor, Liste
 	{
 		try
 		{
-			getAfkPlayer(event.getPlayer()).isDoingAction();
+			// on sors de l'AFK que si la téléportation ne se fait qu'à partir de 2 blocs d'espace
+			// pour éviter qu'on sorte de l'AFK en se faisait pousser par des pistons
+			// car un piston "téléporte" le joueur (techniquement parlant, dans le jeu) à 1 bloc de distance
+			if (event.getFrom().getWorld() != event.getTo().getWorld()
+					|| event.getFrom().distanceSquared(event.getTo()) > 2*2)
+				getAfkPlayer(event.getPlayer()).isDoingAction();
 		}
 		catch (NullPointerException e) { }
 	}