Merge pull request #234 from kashike/this-is-not-the-fly-you-are-looking-for

Fix wrong variable being checked. Fixes #233
This commit is contained in:
Zach 2016-04-22 21:01:26 -05:00
commit 32ddaa3042

View File

@ -1,18 +1,18 @@
From 13bbada8c20eff21947344b3d5fac69bb7cc521f Mon Sep 17 00:00:00 2001
From 83c757b2b09a6ff9dff0f2f2e4861aa324aefdb7 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Tue, 1 Mar 2016 23:12:03 -0600
Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 3203458..8370d94 100644
index 3f1c9bf..64bd053 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1133,12 +1133,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setFlying(boolean value) {
+ boolean needsUpdate = getHandle().abilities.canFly != value; // Paper - Only refresh abilities if needed
+ boolean needsUpdate = getHandle().abilities.isFlying != value; // Paper - Only refresh abilities if needed
if (!getAllowFlight() && value) {
throw new IllegalArgumentException("Cannot make player fly if getAllowFlight() is false");
}