13
0
geforkt von Mirrors/Paper

Update upstream B/CB/S

Dieser Commit ist enthalten in:
Zach Brown 2017-06-12 22:28:09 -05:00
Ursprung 29bba5da9c
Commit 964e06c9a5
6 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen

Datei anzeigen

@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 0144bef9..fbff9860 100644
index e454e70a..c86c1c5f 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -0,0 +0,0 @@ public interface Entity extends Metadatable, CommandSender, Nameable {

Datei anzeigen

@ -17,7 +17,7 @@ index 1381d234e..00208ff45 100644
private final class BooleanWrapper {
private boolean value = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index c39281247..a664c145d 100644
index d12278a52..05f3df4e7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

Datei anzeigen

@ -118,7 +118,7 @@ index ab3d6e484..2695cff93 100644
flag = true;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index ce773218c..c39281247 100644
index dc6a6b37b..d12278a52 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -0,0 +0,0 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {

@ -1 +1 @@
Subproject commit 7b5ab33d620b1d19e00152b4a0d64c160712c3b7
Subproject commit 052c8e5eb578f9c62414f9002f8816e82a198cda

@ -1 +1 @@
Subproject commit ec47e791bda2be9e172e841fbfd50f0e40fcaaf4
Subproject commit f7d14f184d386cb5b0dd604dd1fdcd683fe9e065

@ -1 +1 @@
Subproject commit 8cbfc85b6364a7c7be564bb7b1bb19769dbcee77
Subproject commit cd6ba6798868b56caf949efe0d92fce1560b102e