Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-02-12 13:48:26 +00:00
parent 8a02a8d067
commit 7073c502e9
75 changed files with 299 additions and 753 deletions

View File

@@ -1,14 +1,14 @@
From 24774bf49301649fabd823225cf86b7256429aa3 Mon Sep 17 00:00:00 2001
From 8407525d0a9e0efb1230c43265b094680677cac4 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 eaffcdc..22fc18f 100644
index afbc3d8..2a13ab2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1131,7 +1131,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1129,7 +1129,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setFlySpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@@ -17,7 +17,7 @@ index eaffcdc..22fc18f 100644
player.updateAbilities();
}
@@ -1139,7 +1139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1137,7 +1137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setWalkSpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@@ -27,5 +27,5 @@ index eaffcdc..22fc18f 100644
}
--
1.8.3.2
1.8.4.msysgit.0