mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-27 06:59:52 +02:00
Fix up patch tree.
This commit is contained in:
parent
536ed49937
commit
8d428932b4
|
@ -1,17 +1,14 @@
|
||||||
From 1b666e47c484bbf9b02653da53a53e978bc645dd Mon Sep 17 00:00:00 2001
|
From 7e6fa10b69f0c1aedc0835a504135986d96d3092 Mon Sep 17 00:00:00 2001
|
||||||
From: ninja- <xninja@openmailbox.org>
|
From: ninja- <xninja@openmailbox.org>
|
||||||
Date: Tue, 8 Oct 2013 14:35:58 +0200
|
Date: Tue, 8 Oct 2013 14:35:58 +0200
|
||||||
Subject: [PATCH] Add respawn API.
|
Subject: [PATCH] Add respawn API.
|
||||||
|
|
||||||
---
|
|
||||||
src/main/java/org/bukkit/entity/Player.java | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||||
index 9ee8f5f..8fd9a07 100644
|
index 9ee8f5f..8fd9a07 100644
|
||||||
--- a/src/main/java/org/bukkit/entity/Player.java
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
||||||
+++ b/src/main/java/org/bukkit/entity/Player.java
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
||||||
@@ -762,6 +762,14 @@ public void setCollidesWithEntities(boolean collides)
|
@@ -762,6 +762,14 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
|
||||||
{
|
{
|
||||||
throw new UnsupportedOperationException( "Not supported yet." );
|
throw new UnsupportedOperationException( "Not supported yet." );
|
||||||
}
|
}
|
||||||
|
@ -27,4 +24,5 @@ index 9ee8f5f..8fd9a07 100644
|
||||||
|
|
||||||
Spigot spigot();
|
Spigot spigot();
|
||||||
--
|
--
|
||||||
1.8.4
|
1.8.1.2
|
||||||
|
|
|
@ -1,17 +1,14 @@
|
||||||
From 228b3e3112bbfc6e56b082ffabf68774f8a7c87c Mon Sep 17 00:00:00 2001
|
From 555ab8ce507ae4a847914d9682608f40dbae92cc 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.
|
||||||
|
|
||||||
---
|
|
||||||
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 9 +++++++++
|
|
||||||
1 file changed, 9 insertions(+)
|
|
||||||
|
|
||||||
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..2c607aa 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 void setCollidesWithEntities(boolean collides)
|
@@ -1135,6 +1135,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
||||||
getHandle().collidesWithEntities = collides;
|
getHandle().collidesWithEntities = collides;
|
||||||
getHandle().m = collides; // First boolean of Entity
|
getHandle().m = collides; // First boolean of Entity
|
||||||
}
|
}
|
||||||
|
@ -28,4 +25,5 @@ index 33674b1..2c607aa 100644
|
||||||
|
|
||||||
public Player.Spigot spigot()
|
public Player.Spigot spigot()
|
||||||
--
|
--
|
||||||
1.8.4
|
1.8.1.2
|
||||||
|
|
Loading…
Reference in New Issue
Block a user