From 06f97ac2f11d6c85791027b5e57f1ff0c48f4c61 Mon Sep 17 00:00:00 2001
From: bm01 <baptiste.marie@orange.fr>
Date: Tue, 8 May 2012 20:20:23 +0200
Subject: [PATCH] Fixed a bug where a player could gain Acrobatics exp while
 riding a cart

---
 Changelog.txt                                                 | 1 +
 src/main/java/com/gmail/nossr50/listeners/EntityListener.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 7b6ebd225..21b4d0744 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -20,6 +20,7 @@ Version 1.3.07
  + Added config options for enabling/disabling specific double drops
  + Added automatic zip backup of flatfile database & config files
  + Added config options to enable/disable specific skills for PVP & PVE
+ = Fixed bug where a player could gain Acrobatics experience while riding a cart
  = Fixed /party not working properly with 2 arguments
  = Fixed /ability not checking the right permission
  = Fixed rare NPE on /party command
diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
index 2a1a0ba90..8ac7704c5 100644
--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -121,7 +121,7 @@ public class EntityListener implements Listener {
             }
 
             if (!Misc.isInvincible(player, event)) {
-                if (cause == DamageCause.FALL && Permissions.getInstance().acrobatics(player)) {
+                if (cause == DamageCause.FALL && Permissions.getInstance().acrobatics(player) && !player.isInsideVehicle()) {
                     Acrobatics.acrobaticsCheck(player, event);
                 }
                 else if (cause == DamageCause.BLOCK_EXPLOSION && Permissions.getInstance().demolitionsExpertise(player)) {