Update to 1.7.5

By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-03-23 00:06:43 +00:00
parent 2bba2bc54f
commit b215942177
70 changed files with 583 additions and 586 deletions

View File

@@ -1,16 +1,16 @@
From 5fb37487fae01f9d7786273cdd8ed756132e5b52 Mon Sep 17 00:00:00 2001
From b79b05d49d9a71fc566f8d8de36b604395813867 Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2a13ab2..1b902b2 100644
index 962880b..d5903b7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1270,6 +1270,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().l = collides; // First boolean of Entity
getHandle().k = collides; // First boolean of Entity
}
+
+ @Override
@@ -25,5 +25,5 @@ index 2a13ab2..1b902b2 100644
public Player.Spigot spigot()
--
1.8.3.2
1.8.5.2.msysgit.0