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: bb813f6f SPIGOT-4605: Warn against hacking physics CraftBukkit Changes: 2ced0233 Don't handle sync packets for kicked players d5e96882 SPIGOT-4602: Cache reflection in decompile error workaround Spigot Changes: b0f4c22b SPIGOT-4605: Catch more physics problems
This commit is contained in:
parent
f8058a8187
commit
abba3d113b
54 changed files with 250 additions and 245 deletions
|
@ -1,4 +1,4 @@
|
|||
From 33502f142938f89056e273cdbea58ca83c760d89 Mon Sep 17 00:00:00 2001
|
||||
From 40e27a88bcb3fc6ab3299097db52b9df18ddab77 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Mon, 6 Nov 2017 21:10:01 -0500
|
||||
Subject: [PATCH] API to get a BlockState without a snapshot
|
||||
|
@ -9,10 +9,10 @@ on the real tile entity.
|
|||
This is useful for where performance is needed
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
||||
index 46a29d3d..e3337d05 100644
|
||||
index 7664728a0..064acf321 100644
|
||||
--- a/src/main/java/org/bukkit/block/Block.java
|
||||
+++ b/src/main/java/org/bukkit/block/Block.java
|
||||
@@ -227,6 +227,15 @@ public interface Block extends Metadatable {
|
||||
@@ -254,6 +254,15 @@ public interface Block extends Metadatable {
|
||||
*/
|
||||
BlockState getState();
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
From 10ce18ced17baa36f2ffe0e9a3604e314d20830f Mon Sep 17 00:00:00 2001
|
||||
From 39f3eeefa7b52425c8f1dd8fea1c0388ead63454 Mon Sep 17 00:00:00 2001
|
||||
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
||||
Date: Tue, 14 Aug 2018 21:42:10 -0700
|
||||
Subject: [PATCH] Allow Blocks to be accessed via a long key
|
||||
|
@ -18,7 +18,7 @@ Y range: [0, 1023]
|
|||
X, Z range: [-67 108 864, 67 108 863]
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
|
||||
index 8dcb15fb..7e1ee875 100644
|
||||
index 8dcb15fb8..7e1ee875e 100644
|
||||
--- a/src/main/java/org/bukkit/Location.java
|
||||
+++ b/src/main/java/org/bukkit/Location.java
|
||||
@@ -10,7 +10,6 @@ import org.bukkit.util.Vector;
|
||||
|
@ -49,7 +49,7 @@ index 8dcb15fb..7e1ee875 100644
|
|||
* @return A new location where X/Y/Z are the center of the block
|
||||
*/
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 92688252..1467debe 100644
|
||||
index 61f2cd9a7..30204b987 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -75,6 +75,37 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
|
@ -91,10 +91,10 @@ index 92688252..1467debe 100644
|
|||
* Gets the y coordinate of the lowest block at this position such that the
|
||||
* block and all blocks above it are transparent for lighting purposes.
|
||||
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
||||
index e3337d05..1f97e3d3 100644
|
||||
index 064acf321..d1a9512aa 100644
|
||||
--- a/src/main/java/org/bukkit/block/Block.java
|
||||
+++ b/src/main/java/org/bukkit/block/Block.java
|
||||
@@ -143,6 +143,33 @@ public interface Block extends Metadatable {
|
||||
@@ -144,6 +144,33 @@ public interface Block extends Metadatable {
|
||||
*/
|
||||
int getZ();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue