mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 15:49:00 +01:00
[Auto] Updated Upstream (CraftBukkit)
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
CraftBukkit Changes:
e7ced970
Catch plugins setting null Material or BlockData to blocks
This commit is contained in:
parent
442538c84f
commit
0e6f024eda
2 changed files with 2 additions and 2 deletions
|
@ -39,7 +39,7 @@ index b3c5766a27..29fe031d85 100644
|
|||
return null;
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||
index 922266441d..96e188b3ad 100644
|
||||
index f19df71fc3..f4c0c0c5e2 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||
@@ -0,0 +0,0 @@ public class CraftBlock implements Block {
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 8ab46ff7c68434c9be24f191ce0126b656a86a0d
|
||||
Subproject commit e7ced970d291b283a6fe01462d2222bf673b4cd3
|
Loading…
Reference in a new issue