19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
29 lines
1,018 B
Diff
29 lines
1,018 B
Diff
From e4c6e599c1e8c3d4d22b638596a6b72981bbd29e 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
|
|
--- 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 {
|
|
getHandle().collidesWithEntities = collides;
|
|
getHandle().k = collides; // First boolean of Entity
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public void respawn()
|
|
+ {
|
|
+ if ( getHealth() <= 0 && isOnline() )
|
|
+ {
|
|
+ server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
|
|
+ }
|
|
+ }
|
|
};
|
|
|
|
public Player.Spigot spigot()
|
|
--
|
|
2.1.0
|
|
|