mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 23:10:16 +01:00
[Auto] Updated Upstream (Bukkit/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
Bukkit Changes:
97368963 Update ChunkSnapshot docs about valid coordinates
CraftBukkit Changes:
3831ae62
SPIGOT-4325: Validate coordinate arguments in Chunk/ChunkSnapshot
This commit is contained in:
parent
5c1c89e45e
commit
adfd86f58a
3 changed files with 6 additions and 6 deletions
|
@ -1,14 +1,14 @@
|
|||
From 31da49d27c56548c3381a2aeda3548d6f89e088a Mon Sep 17 00:00:00 2001
|
||||
From c9264f8c58b0da91bead0c09f1768e39b26501c8 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 15 Aug 2018 01:16:34 -0400
|
||||
Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
index 0a47353b48..3238ca7420 100644
|
||||
index 76d395c4ed..12c6d850d2 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
|
||||
@@ -96,7 +96,12 @@ public class CraftChunk implements Chunk {
|
||||
@@ -99,7 +99,12 @@ public class CraftChunk implements Chunk {
|
||||
return entities;
|
||||
}
|
||||
|
||||
|
@ -21,7 +21,7 @@ index 0a47353b48..3238ca7420 100644
|
|||
int index = 0;
|
||||
net.minecraft.server.Chunk chunk = getHandle();
|
||||
|
||||
@@ -108,7 +113,7 @@ public class CraftChunk implements Chunk {
|
||||
@@ -111,7 +116,7 @@ public class CraftChunk implements Chunk {
|
||||
}
|
||||
|
||||
BlockPosition position = (BlockPosition) obj;
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 410a601d008d1c13612815b900f28c00ac4b90a6
|
||||
Subproject commit 9736896362b5ff5e6d79f3201983b9b3c2ddda26
|
|
@ -1 +1 @@
|
|||
Subproject commit a1ab86d8cb5e264c2a4032c3729407534d21d33a
|
||||
Subproject commit 3831ae621f5b75add3ad528b1f07dd30c154fcae
|
Loading…
Reference in a new issue