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

Fix conflicts.

Browse Source
This commit is contained in:
md_5
2015-07-10 22:33:16 +10:00
committed by Byteflux
parent a5bb700ee9
commit 5683ee8585
27 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From 912676be4d810f5268b2dfb76c86b4f976953ae7 Mon Sep 17 00:00:00 2001
From 03820e05d3d87448b1242ed5ca4c68d9ffa01c74 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 001415a..7310212 100644
index b79a31c..5556620 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1344,6 +1344,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1364,6 +1364,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().collidesWithEntities = collides;
getHandle().k = collides; // First boolean of Entity
}