geforkt von Mirrors/Paper
1ab021ddca
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:
565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
CraftBukkit Changes:
927200a9 #718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
36 Zeilen
1.8 KiB
Diff
36 Zeilen
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 7 Jun 2020 19:25:13 -0400
|
|
Subject: [PATCH] Use seed based lookup for Treasure Maps - Fixes lag from
|
|
carto/sunken maps
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemWorldMap.java b/src/main/java/net/minecraft/server/ItemWorldMap.java
|
|
index 63b112b38a51873cf5769ad8506c3fdb9d52d42c..910d1b3788fa713cadf2c8a56f595282ba6c1247 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemWorldMap.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemWorldMap.java
|
|
@@ -229,7 +229,7 @@ public class ItemWorldMap extends ItemWorldMapBase {
|
|
|
|
for (l = 0; l < 128 * i; ++l) {
|
|
for (i1 = 0; i1 < 128 * i; ++i1) {
|
|
- abiomebase[l * 128 * i + i1] = worldserver.getBiome(new BlockPosition((j / i - 64) * i + i1, 0, (k / i - 64) * i + l));
|
|
+ abiomebase[l * 128 * i + i1] = worldserver.getBiomeBySeed((j / i - 64) * i + i1, 0, (k / i - 64) * i + l); // Paper
|
|
}
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 9d13745382d34693a0ebdcfe1c3392fb0b4f15b5..6ea416f25395fe8dac2d147c20e5d9c5a5083242 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -303,8 +303,8 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
|
this.worldDataServer.setThundering(flag1);
|
|
}
|
|
|
|
- @Override
|
|
- public BiomeBase a(int i, int j, int k) {
|
|
+ public BiomeBase getBiomeBySeed(int i, int j, int k) { return a(i, j, k); } // Paper - OBFHELPER
|
|
+ @Override public BiomeBase a(int i, int j, int k) {
|
|
return this.getChunkProvider().getChunkGenerator().getWorldChunkManager().getBiome(i, j, k);
|
|
}
|
|
|