Upstream merge

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-18 17:48:18 +11:00
parent be8c216be7
commit 72cde1fd01
36 changed files with 109 additions and 274 deletions

View File

@@ -1,14 +1,14 @@
From 9584169bdf6aa8b3c0d06f042d5306ca49a31a21 Mon Sep 17 00:00:00 2001
From 6bb008fdb2d32afe9c09041be54fdf42c5869f85 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 2492000..627a580 100644
index 06b13c3..3524bce 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1003,7 +1003,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1005,7 +1005,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setFlySpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();
@@ -17,7 +17,7 @@ index 2492000..627a580 100644
player.updateAbilities();
}
@@ -1011,7 +1011,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1013,7 +1013,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setWalkSpeed(float value) {
validateSpeed(value);
EntityPlayer player = getHandle();