SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Fix entity dead check in respawn API

Quellcode durchsuchen
Dieser Commit ist enthalten in:
md_5 2013-10-11 22:23:25 +11:00
Ursprung 39c6e1be1f
Commit d302efeeb7
1 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

6
CraftBukkit-Patches/0075-Implement-respawn-API.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 555ab8ce507ae4a847914d9682608f40dbae92cc Mon Sep 17 00:00:00 2001 From 2fafbcfb32166ba0814f976c91e48cf435047a7d Mon Sep 17 00:00:00 2001
From: ninja- <xninja@openmailbox.org> From: ninja- <xninja@openmailbox.org>
Date: Tue, 8 Oct 2013 14:34:49 +0200 Date: Tue, 8 Oct 2013 14:34:49 +0200
Subject: [PATCH] Implement respawn API. 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 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 33674b1..2c607aa 100644 index 33674b1..ed93040 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1135,6 +1135,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -1135,6 +1135,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -16,7 +16,7 @@ index 33674b1..2c607aa 100644
+ @Override + @Override
+ public void respawn() + public void respawn()
+ { + {
+ if ( entity.dead ) + if ( getHealth() <= 0 )
+ { + {
+ server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false ); + server.getServer().getPlayerList().moveToWorld( getHandle(), 0, false );
+ } + }