Skip to content

Commit

Permalink
[Auto] Updated Upstream (CraftBukkit)
Browse files Browse the repository at this point in the history
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:
e7ced97 Catch plugins setting null Material or BlockData to blocks
  • Loading branch information
aikar committed Oct 12, 2018
1 parent 35fcc2e commit 6a60c42
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From c579bd8a4185d49e669eea46646c157d71201936 Mon Sep 17 00:00:00 2001
From f274e65f30c13edff060cd5f343b54a830399712 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Mon, 6 Nov 2017 21:08:22 -0500
Subject: [PATCH] API to get a BlockState without a snapshot
Expand Down Expand Up @@ -39,10 +39,10 @@ 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
@@ -267,6 +267,20 @@ public class CraftBlock implements Block {
@@ -269,6 +269,20 @@ public class CraftBlock implements Block {
}

public BlockState getState() {
Expand Down Expand Up @@ -131,5 +131,5 @@ index e6f86cc4b1..3a8f643609 100644

@Override
--
2.19.0
2.19.1

2 changes: 1 addition & 1 deletion work/CraftBukkit
Submodule CraftBukkit updated from 8ab46f to e7ced9

0 comments on commit 6a60c42

Please sign in to comment.