Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update from upstream SpigotMC

Browse Source 
66af3b310e0
a969bf6c85d
95d56229d8f
87c1d0c8b7c
baf01cc7f84
38b8866783d [M]
This commit is contained in:
Zach Brown
2014-12-02 00:02:15 -06:00
parent 2a326d9446
commit c55b9c30d7
17 changed files with 95 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CraftBukkit-Patches/0046-Implement-respawn-API.patch
View File

@@ -1,14 +1,14 @@
From e4c6e599c1e8c3d4d22b638596a6b72981bbd29e Mon Sep 17 00:00:00 2001
From 76c0cd8eadad79d1d0364139c2460c7292cc0dc7 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 6bdf188..26e77d2 100644
index b8dcea5..7851f21 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1327,6 +1327,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1328,6 +1328,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().k = collides; // First boolean of Entity
}