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

Update from upstream SpigotMC

Browse Source 
a3168ab2ce4
9b45d9fa8d3
b43a31a5c25
a926b96d5d1
d6b5ba7ca03
bb782d07aed
5a74d55c678
47b1dff3e68 [M]
This commit is contained in:
Zach Brown
2014-12-18 17:33:08 -06:00
parent eb71958f5c
commit 6a5e553feb
51 changed files with 174 additions and 585 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 76c0cd8eadad79d1d0364139c2460c7292cc0dc7 Mon Sep 17 00:00:00 2001
From d54e960ee49e15b10bbd54010ab2f2ac8d04941b 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 b8dcea5..7851f21 100644
index 348b6e2..272f7df 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1328,6 +1328,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1331,6 +1331,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().k = collides; // First boolean of Entity
}