mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08: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
35fcc2e2d0
commit
6a60c4295d
@ -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>
|
From: Aikar <aikar@aikar.co>
|
||||||
Date: Mon, 6 Nov 2017 21:08:22 -0500
|
Date: Mon, 6 Nov 2017 21:08:22 -0500
|
||||||
Subject: [PATCH] API to get a BlockState without a snapshot
|
Subject: [PATCH] API to get a BlockState without a snapshot
|
||||||
@ -39,10 +39,10 @@ index b3c5766a27..29fe031d85 100644
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
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
|
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
|
||||||
+++ b/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() {
|
public BlockState getState() {
|
||||||
@ -131,5 +131,5 @@ index e6f86cc4b1..3a8f643609 100644
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
--
|
--
|
||||||
2.19.0
|
2.19.1
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 8ab46ff7c68434c9be24f191ce0126b656a86a0d
|
Subproject commit e7ced970d291b283a6fe01462d2222bf673b4cd3
|
Loading…
Reference in New Issue
Block a user