mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Upstream merge

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
Spigot 2013-12-18 17:48:18 +11:00
commit 72cde1fd01
36 changed files with 109 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CraftBukkit-Patches/0059-Implement-respawn-API.patch
View file

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