Merge in some stuff

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2013-12-14 17:58:22 +11:00
parent 098db09224
commit 5cd48cf621
14 changed files with 54 additions and 54 deletions

View File

@@ -1,14 +1,14 @@
From e5341b42a62c7f139ac3eedbb0c50c0bbfec5cfc Mon Sep 17 00:00:00 2001
From 443c2d3ba804b76d3c18dd0bcac4011e14f755b3 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 07f7c2e..f870cc6 100644
index 627a580..9569bd4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1143,6 +1143,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1144,6 +1144,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().l = collides; // First boolean of Entity
}