Merge some stuff from upstream.

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-02 17:54:35 +11:00
parent 04c83ec337
commit c936739c09
14 changed files with 49 additions and 49 deletions

View File

@@ -1,14 +1,14 @@
From 21ecc7a983df97c214c0d2d90c1fc6c0739cc5bb Mon Sep 17 00:00:00 2001
From f63feee9a42d228213e66d8be6428724630265e9 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 5 Aug 2013 20:17:20 +1000
Subject: [PATCH] Cap Minimum Player Speed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index d251e79..6903d41 100644
index d61e6fc..df6569a 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1129,7 +1129,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1130,7 +1130,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setFlySpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@@ -17,7 +17,7 @@ index d251e79..6903d41 100644
player.updateAbilities();
}
@@ -1137,7 +1137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1138,7 +1138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setWalkSpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@@ -27,5 +27,5 @@ index d251e79..6903d41 100644
}
--
1.8.5.2.msysgit.0
1.8.3.2