Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 78568d11 Tweak Block.getTemperature to return actual block temperature 9ad459ca SPIGOT-2151: Add support for getting simple bounding box of a block ad28b19f Add BlockData#getAsString(boolean) to hide unspecified states CraftBukkit Changes: 1b982fd6 Tweak Block.getTemperature to return actual block temperature f55c8191 SPIGOT-2151: Add support for getting simple bounding box of a block 4b843638 Add BlockData#getAsString(boolean) to hide unspecified states Spigot Changes: 573cdf2c BUILDTOOLS-425: Disable commit.gpgSign in applyPatches.sh 667bdd6b Deprecate Spigot version of Entity.isInvulnerable
This commit is contained in:
@@ -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 4f5eb3676..d793de62c 100644
|
||||
index 236cddb2..015a4c56 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 {
|
||||
@@ -25,7 +25,7 @@ index 4f5eb3676..d793de62c 100644
|
||||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
|
||||
index 0cd830d90..170a9aee5 100644
|
||||
index 0cd830d9..170a9aee 100644
|
||||
--- a/src/main/java/org/bukkit/entity/FallingBlock.java
|
||||
+++ b/src/main/java/org/bukkit/entity/FallingBlock.java
|
||||
@@ -0,0 +0,0 @@ public interface FallingBlock extends Entity {
|
||||
@@ -45,7 +45,7 @@ index 0cd830d90..170a9aee5 100644
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
|
||||
index a439eaf56..04cc23ef1 100644
|
||||
index a439eaf5..04cc23ef 100644
|
||||
--- a/src/main/java/org/bukkit/entity/TNTPrimed.java
|
||||
+++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
|
||||
@@ -0,0 +0,0 @@ public interface TNTPrimed extends Explosive {
|
||||
|
||||
Reference in New Issue
Block a user