core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated Upstream (Bukkit/CraftBukkit) 

Upstream has released updates that appear 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:
19b7b7bd #561: Add clear weather World API
5929c808 #552: Add the ability to retrieve hit, step, fall, and other sounds from blocks.

CraftBukkit Changes:
e1ebdd92 #771: Add clear weather World API
424598d2 #752: Add the ability to retrieve hit, step, fall, and other sounds from blocks.
This commit is contained in:
Shane Freeder 2020-11-25 23:45:25 +00:00
parent 83f377be8b
commit 0faaa7da92
43 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/0009-Timings-v2.patch
View File

@ -1633,7 +1633,7 @@ index b9ffd000c97111678d45fd55dc9c207ebadc140e..f1d0e2faffb3ef27f5a41d06d0ff7d78
private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
public CraftPersistentDataContainer persistentDataContainer;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 43f49a2a7f62227f35c309d4d63088a6e013481b..8703a001c9d2bf114b140a94f20e0cf7e57361f9 100644
index cb09b6947080f742b15b166e96e91231fcb5e79e..e24c5e20f128e787f0a0e58716944dd8748f73c1 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -18,7 +18,6 @@ import org.apache.logging.log4j.Logger;
@ -2012,7 +2012,7 @@ index 7f435847ac1d13756ce233e7d5ae13f9dc17c443..00000000000000000000000000000000
- }
-}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ddf385ec21cbfc163bb4fb8bb21b0e1ab1db2004..756e5d416e5a53eaf93f434ed27b3517f11bfef5 100644
index a1faa13cbf11c084ed146c86e4fac111e01fdd4a..04043d3c317fb7fa7b5b03ac5af874f6ffd775a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1821,6 +1821,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch
View File

@ -20,7 +20,7 @@ index eb3185250812f5c2b2d24a2de6b2248d280b771e..b2dfad6a75c18b81c76539b7327a85da
+ }
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 8703a001c9d2bf114b140a94f20e0cf7e57361f9..ebf719d45cd07082ef794028592fbd923177134d 100644
index e24c5e20f128e787f0a0e58716944dd8748f73c1..3f2ca3874f743c635fd6a7f6c18d554425a0c056 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -165,6 +165,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0020-Player-affects-spawning-API.patch
View File

@ -131,7 +131,7 @@ index 90af43930f9141b0c7f51bb3d887d7b9c4d935eb..1741ec5e241f8ae7a3c30a9021d14cb0
public void c() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 756e5d416e5a53eaf93f434ed27b3517f11bfef5..30bf765131f6502a823606863c611e281add9a19 100644
index 04043d3c317fb7fa7b5b03ac5af874f6ffd775a5..7370bde6accd4eac6007f8fccc0933981fb1ed51 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1709,7 +1709,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 30bf765131f6502a823606863c611e281add9a19..32775b97926f470a2e0a5c1c0ead81b7d4e97476 100644
index 7370bde6accd4eac6007f8fccc0933981fb1ed51..aeae422524e8e135549e0d6e4ccf4a553c1061b2 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1389,12 +1389,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch
View File

@ -23,7 +23,7 @@ index f1d0e2faffb3ef27f5a41d06d0ff7d787f1098f5..da96a91c6b4cc03ad2e4539053bd30e7
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ebf719d45cd07082ef794028592fbd923177134d..dab129dd83024bdcee251393e1854ff384ff3c26 100644
index 3f2ca3874f743c635fd6a7f6c18d554425a0c056..fb26ec91ecdeaa94a6247c064b7c6191a43927eb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -685,11 +685,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0032-Optimize-explosions.patch
View File

@ -135,7 +135,7 @@ index 775306d7e59ff135004e54d2d055bd05edba7e61..4d3cb70f1567b042e1605b3063770656
this.methodProfiler.exitEnter("connection");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index dab129dd83024bdcee251393e1854ff384ff3c26..611c7a5c1da8afa9a8caaa668c40517d560c8396 100644
index fb26ec91ecdeaa94a6247c064b7c6191a43927eb..d8ff91fea7d00f035bac0fa7378dcf675a719857 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -84,6 +84,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0034-Disable-thunder.patch
View File

@ -19,7 +19,7 @@ index 623186e8503ff1debabc409b27fd3d29dcd5ced8..0770de735f3cf4eb46c4ffd5b76eb393
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 37c4b75f4dcb490e243082897713583060f394b2..d86df7b56314101571ed9c2d77bfae4a5bd2f935 100644
index 5c5229a815f098411450f6affb883c40c170fb2e..5d3ac78e6a5366ea94425924de41175495a3e906 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -475,7 +475,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0035-Disable-ice-and-snow.patch
View File

@ -19,7 +19,7 @@ index 0770de735f3cf4eb46c4ffd5b76eb393ad94a166..870b50b1b981943eaba874fe26d89e11
+ }
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index d86df7b56314101571ed9c2d77bfae4a5bd2f935..8ed0c4f1e84adc602e01f10049c6e553880cb76a 100644
index 5d3ac78e6a5366ea94425924de41175495a3e906..ef7b76c4a9b5bafa4780922558538bbdcd783120 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -499,7 +499,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Disable spigot tick limiters
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 611c7a5c1da8afa9a8caaa668c40517d560c8396..9714aeeb1e6431a494fdce8f81cd470a70c5e228 100644
index d8ff91fea7d00f035bac0fa7378dcf675a719857..1a6e39e34186534d4784d4fddffa45dfd2496840 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -655,9 +655,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch
View File

@ -9,7 +9,7 @@ This is a duplicate API from spigot, so use our duplicate subclass and
improve setPosition to use raw
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 73ec13ff213ed52a4a5bb79cbd9079f1e74ced8a..7c6e35590f4217ec68ddfc3e189b847eb48b1c20 100644
index 5b49047b820dbe1f326320b71445ac216bf688b5..3b7c4c611e8936faef09f3bec80f96037e45d77d 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -143,7 +143,7 @@ public abstract class PlayerList {

2
Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch
View File

@ -52,7 +52,7 @@ index 3a6e780007bc1b1fa799166daa01d3a9e15c7ab0..535056c64ef866e645b1bfbd149b50c5
if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 32775b97926f470a2e0a5c1c0ead81b7d4e97476..04a3700c6d4caffcf5b8f7867d12d42ac4478a37 100644
index aeae422524e8e135549e0d6e4ccf4a553c1061b2..4a7ac9ddbfa221645f68be34db4b5704661ef5a6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1,5 +1,6 @@

2
Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list
use sets for faster removal
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 9714aeeb1e6431a494fdce8f81cd470a70c5e228..7cc5b8d8ccedc550dccfa51f6dcc0fcbd3641aee 100644
index 1a6e39e34186534d4784d4fddffa45dfd2496840..70d6ed9a226ab114b090017cec6998a740b2cb66 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -37,7 +37,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch
View File

@ -30,7 +30,7 @@ index cff769a0cffd81501f919fad0c6456e1268bd223..a6c02f676f4206f2f59862530999cd74
+ }
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 04a3700c6d4caffcf5b8f7867d12d42ac4478a37..a1e00c468e77bfa995f117207ad3208bdc7ec028 100644
index 4a7ac9ddbfa221645f68be34db4b5704661ef5a6..000cd89542122960649e42e9cad334f1da3514a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -783,7 +783,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
Spigot-Server-Patches/0054-Add-exception-reporting-event.patch
View File

@ -187,7 +187,7 @@ index 1844a6504acc420bdfaaf8f045c569e970d055db..d6aadbda5c5a17976659f57ee04cf9b9
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7cc5b8d8ccedc550dccfa51f6dcc0fcbd3641aee..89d773ff59ad884a49a9ef26bc590d14c7df7776 100644
index 70d6ed9a226ab114b090017cec6998a740b2cb66..db637b5f9ed4180844ddc12dc53050a89a4d163d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1,5 +1,10 @@

2
Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
View File

@ -22,7 +22,7 @@ index c70e290405c7c5ba247c1d3cce286579260cc76d..a6596d17a6c942061d98fed2cbb71045
// CraftBukkit end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a1e00c468e77bfa995f117207ad3208bdc7ec028..e070e4e874bb5c08ab130a9ab6f5f7234df8c1f1 100644
index 000cd89542122960649e42e9cad334f1da3514a9..3eb7efc728cb64453348bbdabd8ecbb465dfddcd 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -138,6 +138,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
Spigot-Server-Patches/0065-Add-World-Util-Methods.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
Methods that can be used for other patches to help improve logic.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 89d773ff59ad884a49a9ef26bc590d14c7df7776..c1d3dd294049c93beddaf5e4d513913cebb639df 100644
index db637b5f9ed4180844ddc12dc53050a89a4d163d..bfa9b3482251341947da8e6c4def762bf7d725b7 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -245,11 +245,27 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@ -51,7 +51,7 @@ index bb0f30f182856d2701fde9b1a65eeb987462104a..717f495abd63218bb7ce9241e7cfeac8
return (double) (blockposition.getX() + 1) > this.e() && (double) blockposition.getX() < this.g() && (double) (blockposition.getZ() + 1) > this.f() && (double) blockposition.getZ() < this.h();
}
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 8ed0c4f1e84adc602e01f10049c6e553880cb76a..e307f939745db9688e96c42a70d337e8751874f2 100644
index ef7b76c4a9b5bafa4780922558538bbdcd783120..01fde964fa2fae3cfefc4b9e8e2c59a997d09539 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -88,7 +88,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {

2
Spigot-Server-Patches/0067-handle-NaN-health-absorb-values-and-repair-bad-data.patch
View File

@ -44,7 +44,7 @@ index 67a64bba9944c0c87e7141469c460b7c4626e75f..f9ae19f6997631c72afb6014cbec271f
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e070e4e874bb5c08ab130a9ab6f5f7234df8c1f1..9d10107169b5439c725b8450fab0b0d0dd96423e 100644
index 3eb7efc728cb64453348bbdabd8ecbb465dfddcd..a8b0bfe18c88ff14fa285cbf2f0da7713f20d0cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1630,6 +1630,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

2
Spigot-Server-Patches/0070-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
View File

@ -192,7 +192,7 @@ index 5cfddbfe0bd84c994ed7fa4968bcf4fc13381001..420bf7116def909d3dd7dc9a79972344
@Override
public Fluid getFluid(BlockPosition blockposition) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c1d3dd294049c93beddaf5e4d513913cebb639df..92785a80bae6b5c88285536f74f23e0609d793ac 100644
index bfa9b3482251341947da8e6c4def762bf7d725b7..babf153a3cdf13e7055269adace3948f180925fe 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -187,7 +187,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0071-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
View File

@ -44,7 +44,7 @@ index 4d3cb70f1567b042e1605b30637706560bd883d9..2193e395e05bbfcd32f95445c85b65ee
this.methodProfiler.a(() -> {
return worldserver + " " + worldserver.getDimensionKey().a();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 92785a80bae6b5c88285536f74f23e0609d793ac..19f0149051d9ff58223624754b27285c4c99b769 100644
index babf153a3cdf13e7055269adace3948f180925fe..4dfc49ba09e3c4a6f58c74f3ea71a22ce63dbc36 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -406,7 +406,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0080-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 19f0149051d9ff58223624754b27285c4c99b769..b2be738480442898603a1bd9f38aebb30ec9ebef 100644
index 4dfc49ba09e3c4a6f58c74f3ea71a22ce63dbc36..1f4b9740557b58bd78a7683e69310853094b172b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -466,6 +466,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0084-Remove-unused-World-Tile-Entity-List.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
Massive hit to performance and it is completely unnecessary.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b2be738480442898603a1bd9f38aebb30ec9ebef..e1f2177b3ce48cc8f9bca6e014065d787e4741e4 100644
index 1f4b9740557b58bd78a7683e69310853094b172b..9c90f13d179146c0af0ea3e8990f762ca74e5789 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -39,7 +39,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0101-Faster-redstone-torch-rapid-clock-removal.patch
View File

@ -77,7 +77,7 @@ index d88d435b7777f731bc0bb728ebe4d4cb31c6376e..a63a60348fe45f63deec6fcb27b6be09
public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
this.a = blockposition;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e1f2177b3ce48cc8f9bca6e014065d787e4741e4..f166add9a9f5542c26dad9c976dc59b4c6350be9 100644
index 9c90f13d179146c0af0ea3e8990f762ca74e5789..6e3f29d40e35e583d8ace7e1e25dc2171414c2b0 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -90,6 +90,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0124-Optimize-World.isLoaded-BlockPosition-Z.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
Reduce method invocations for World.isLoaded(BlockPosition)Z
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f166add9a9f5542c26dad9c976dc59b4c6350be9..c8e767a32483584d57a5c42e87fba2c63d7f9e6b 100644
index 6e3f29d40e35e583d8ace7e1e25dc2171414c2b0..d44554916691411e3e376ffb04dc2f182c603a29 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -252,6 +252,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0163-Fix-MC-117075-TE-Unload-Lag-Spike.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c8e767a32483584d57a5c42e87fba2c63d7f9e6b..4d1a720bf7043a60546e165921def29b4465e72a 100644
index d44554916691411e3e376ffb04dc2f182c603a29..327a668f1306f1ec90e63598da925fce576e6ed5 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -673,7 +673,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0177-use-CB-BlockState-implementations-for-captured-block.patch
View File

@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping
information on restoration when the event is cancelled.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4d1a720bf7043a60546e165921def29b4465e72a..cc17d9862ed6169c332896d81dc18209234cfa00 100644
index 327a668f1306f1ec90e63598da925fce576e6ed5..54d7d0da6ee998319db2454372ca283a9d571cdb 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -71,7 +71,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0241-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch
View File

@ -40,7 +40,7 @@ index 8862bbd73b627e37709d46e6aeeee70c89cbd821..4bbcd00950405a4bf3ce391b557049a3
protected void g() {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index cc17d9862ed6169c332896d81dc18209234cfa00..6003201197a89fa6c46c35d711a53db690295b1e 100644
index 54d7d0da6ee998319db2454372ca283a9d571cdb..fa095bb55c09a3b5f8ab70bcce5a03c7eb93dcfa 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -68,6 +68,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0246-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
View File

@ -31,7 +31,7 @@ index 96c229e5dd214d32478fe4d5b96e77d8ba2bc93c..2592a59e9506cee901802a3bdc78db88
for (int i = 0; i < list.size(); ++i) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 6003201197a89fa6c46c35d711a53db690295b1e..23a38825b71ea981538f32368705e7a7b98dadaf 100644
index fa095bb55c09a3b5f8ab70bcce5a03c7eb93dcfa..7affb75a97e49b67861b24de38ef83e72b0abd5a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -801,6 +801,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0247-Vanished-players-don-t-have-rights.patch
View File

@ -96,7 +96,7 @@ index ed0f9c5d29c4f88b7beee4b0ecdd7a56de2d7a9e..881cea7c466f29ff4a89db28d104e850
if (operatorboolean.apply(false, false)) {
throw (IllegalArgumentException) SystemUtils.c((Throwable) (new IllegalArgumentException()));
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 23a38825b71ea981538f32368705e7a7b98dadaf..514be9c4356380627032c54b4b1eda37aaefe16d 100644
index 7affb75a97e49b67861b24de38ef83e72b0abd5a..ce596bd1268eb7d6d20709fe1e00a59ccc50957d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -178,6 +178,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0258-Add-hand-to-bucket-events.patch
View File

@ -73,7 +73,7 @@ index 48958308a89cbe39e1b4dddcdd8d1d0b5ece6339..120bf8436fd82294c339add2e7bff1cd
int i = blockposition.getX();
int j = blockposition.getY();
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 514be9c4356380627032c54b4b1eda37aaefe16d..caeca1b5b6aafa5770924c3f9e0cc264f23156ef 100644
index ce596bd1268eb7d6d20709fe1e00a59ccc50957d..3fc77d08e77b1594967c9e08efbd9102265603ea 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -218,6 +218,17 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0323-BlockDestroyEvent.patch
View File

@ -11,7 +11,7 @@ floating in the air.
This can replace many uses of BlockPhysicsEvent
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index caeca1b5b6aafa5770924c3f9e0cc264f23156ef..4d69dd189091681fee7634f9ffa00c4afb63011f 100644
index 3fc77d08e77b1594967c9e08efbd9102265603ea..e3ed6b92d95f4fd061f9de1a17e776358af71763 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -499,8 +499,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0342-Optimize-Captured-TileEntity-Lookup.patch
View File

@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to
just do a get call since the value can never be null.
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 4d69dd189091681fee7634f9ffa00c4afb63011f..5f2cff57c2cd173932b57b9d84f591050e5b8e14 100644
index e3ed6b92d95f4fd061f9de1a17e776358af71763..a86d56ebe2cfecca96e8dbf2f108fd2842a7939a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -908,12 +908,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0343-Add-Heightmap-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add Heightmap API
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5f2cff57c2cd173932b57b9d84f591050e5b8e14..048cfcd32c774148f424b246b1f7048fd437afd8 100644
index a86d56ebe2cfecca96e8dbf2f108fd2842a7939a..f2d2258feadab1a1cb5fffdabc8d90949b980342 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -609,8 +609,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0369-Use-getChunkIfLoadedImmediately-in-places.patch
View File

@ -21,7 +21,7 @@ index 5e74436908c35bfbdba95a39119f115a9512786d..38cd2768374b44b82060b07924b17f35
return;
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e7ad9a926f58cc7e5d70229dd69f2f5b34603a39..7a392774de7affb344166cc3344b2ebf5468e299 100644
index 8c725507caaa7729e1b6b56b14a111765e9427f7..ddf5e3f35a37225f292fb1abba7d9132cd397e32 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -104,6 +104,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0370-Reduce-sync-loads.patch
View File

@ -298,7 +298,7 @@ index 2c47eaf07a46b068c446fc7c71da4b9dfcf39656..7278e39d7fb47737b783c482f4c74a82
this.serverThreadQueue.awaitTasks(completablefuture::isDone);
com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7a392774de7affb344166cc3344b2ebf5468e299..358ea68714fe1352259b158d61a7d1954a2d621b 100644
index ddf5e3f35a37225f292fb1abba7d9132cd397e32..ea4acb47edb1b22d11e932a1b33f4297a18265f4 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1070,7 +1070,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0389-Optimize-Hoppers.patch
View File

@ -485,7 +485,7 @@ index d9be182a574daaedcc7a106c759c2bde2e4eb19a..c6df2318762dc6542e73f18ed9a3172e
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 358ea68714fe1352259b158d61a7d1954a2d621b..f74a062f89a58942ce821f25dec2da46c31bb2a8 100644
index ea4acb47edb1b22d11e932a1b33f4297a18265f4..67a38ed5ec173ece6f072540b9fbb47400bb5af0 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1102,8 +1102,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0401-Entity-Activation-Range-2.0.patch
View File

@ -334,7 +334,7 @@ index 182cd7e9110408fff9909ef362d368d055a2b167..f3df10587e652d3a26d15deb09304b97
return this.c;
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f74a062f89a58942ce821f25dec2da46c31bb2a8..f229fb7409e509878af1dca1ecda058f85a94776 100644
index 67a38ed5ec173ece6f072540b9fbb47400bb5af0..3b0b86bd33601f741850047e3fe0b6022bc1095b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -82,6 +82,12 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0407-Optimise-random-block-ticking.patch
View File

@ -243,7 +243,7 @@ index fa8eab20bb839c53bf7989d02d2274f835002609..4ad393bc99881d813e2b349fb929fc8e
public BlockPosition getHomePos() { // Paper - public
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index f229fb7409e509878af1dca1ecda058f85a94776..c0cf73c57958f5b20cfe8e1f200464274b393447 100644
index 3b0b86bd33601f741850047e3fe0b6022bc1095b..8c58581417ca3e0336359e7db65568a08e025d6d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1412,10 +1412,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0437-Improved-Watchdog-Support.patch
View File

@ -304,7 +304,7 @@ index 1fe1df445ba56b2f176ee25502a774aa0a7bd00b..916a6a1fc1ccc73e4fb974ad77310d16
a(SystemUtils.e);
a(SystemUtils.f);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index c0cf73c57958f5b20cfe8e1f200464274b393447..5ff95f971c01fc010441dcc9099492cb627b3f0c 100644
index 8c58581417ca3e0336359e7db65568a08e025d6d..0dac8af6680a7dc4ecbedf70707297690fb1e694 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -797,6 +797,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0469-No-Tick-view-distance-implementation.patch
View File

@ -607,7 +607,7 @@ index 0f46aac9d021dc115718b1e36b8fbe28cbc820c6..b8ab8150b7dfe9e34910d35f565083e8
while (iterator.hasNext()) {
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 5ff95f971c01fc010441dcc9099492cb627b3f0c..265dafc2e2afc98d2490fa8707a5b72a5543bc9e 100644
index 0dac8af6680a7dc4ecbedf70707297690fb1e694..b479a25044ecf8c1a791729d643cf8dc90193b2b 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -464,8 +464,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0478-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
View File

@ -157,7 +157,7 @@ index a552cc5bebb1a70db2e679a514769d0ad791ad68..72de544c0782e4daff222a0ca04e5bc8
this.world.getMethodProfiler().enter("explosion_blocks");
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 265dafc2e2afc98d2490fa8707a5b72a5543bc9e..fb3776c00cf8b5125550e8a2bc6c270ba8a80dc5 100644
index b479a25044ecf8c1a791729d643cf8dc90193b2b..8d59391befcbc2542a79758d2021ef51df59d815 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -362,6 +362,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
Spigot-Server-Patches/0561-Optimize-redstone-algorithm.patch
View File

@ -1138,7 +1138,7 @@ index 7b3ccded0451f7b6634aeca0bdc1b5cc94f52b96..7f9ca45d403000d26d84198d8f88cd48
c(iblockdata, world, blockposition);
world.a(blockposition, false);
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index fb3776c00cf8b5125550e8a2bc6c270ba8a80dc5..18cddbcb8447c0c09f9aeb8aab40bdf4ea762b3e 100644
index 8d59391befcbc2542a79758d2021ef51df59d815..cbfbdd4c7d91afb779aaf6aa79f9c681078b9b27 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -598,6 +598,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {

2
work/Bukkit

@ -1 +1 @@
Subproject commit f47abd8878a775a446e9608a7ee1584cf827c015
Subproject commit 19b7b7bd27b0bccd904caab5c1d4aa9c71a680a1

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 167ff59173655495f321af8ae4a679544e10d605
Subproject commit e1ebdd927adb21274350d6ae6273c9da7911d033