Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 01:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix 1.16.2 support

Browse Source
This commit is contained in:
Aurora 2020-08-23 18:28:51 +02:00
parent 6cb8352686
commit 7cf88aff65
No known key found for this signature in database
GPG Key ID: 89839F67B53656AD
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_2/BukkitGetBlocks_1_16_2.java
View File

@ -84,7 +84,7 @@ public class BukkitGetBlocks_1_16_2 extends CharGetBlocks {
} else { } else {
base = index.getBiome(x >> 2, y >> 2, z >> 2); base = index.getBiome(x >> 2, y >> 2, z >> 2);
} }
return base != null ? BukkitAdapter.adapt(CraftBlock.biomeBaseToBiome(base)) : null; return base != null ? BukkitAdapter.adapt(CraftBlock.biomeBaseToBiome(world.r().b(IRegistry.ay), base)) : null;
} }
@Override @Override
@ -350,7 +350,7 @@ public class BukkitGetBlocks_1_16_2 extends CharGetBlocks {
final BiomeType biome = biomes[i]; final BiomeType biome = biomes[i];
if (biome != null) { if (biome != null) {
final Biome craftBiome = BukkitAdapter.adapt(biome); final Biome craftBiome = BukkitAdapter.adapt(biome);
BiomeBase nmsBiome = CraftBlock.biomeToBiomeBase(craftBiome); BiomeBase nmsBiome = CraftBlock.biomeToBiomeBase(nmsWorld.r().b(IRegistry.ay) ,craftBiome);
for (int y = 0; y < FaweCache.IMP.WORLD_HEIGHT; y++) { for (int y = 0; y < FaweCache.IMP.WORLD_HEIGHT; y++) {
currentBiomes.setBiome(x >> 2, y >> 2, z >> 2, nmsBiome); currentBiomes.setBiome(x >> 2, y >> 2, z >> 2, nmsBiome);
} }

5
worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/FAWE_Spigot_v1_16_R2.java
View File

@ -49,6 +49,7 @@ import com.sk89q.worldedit.world.registry.BlockMaterial;
import net.minecraft.server.v1_16_R2.*; import net.minecraft.server.v1_16_R2.*;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.craftbukkit.v1_16_R2.CraftChunk; import org.bukkit.craftbukkit.v1_16_R2.CraftChunk;
import org.bukkit.craftbukkit.v1_16_R2.CraftWorld; import org.bukkit.craftbukkit.v1_16_R2.CraftWorld;
@ -449,7 +450,7 @@ public final class FAWE_Spigot_v1_16_R2 extends CachedBukkitAdapter implements I
@Override @Override
public int getInternalBiomeId(BiomeType biome) { public int getInternalBiomeId(BiomeType biome) {
BiomeBase base = CraftBlock.biomeToBiomeBase(BukkitAdapter.adapt(biome)); BiomeBase base = CraftBlock.biomeToBiomeBase(MinecraftServer.getServer().aX().b(IRegistry.ay),BukkitAdapter.adapt(biome));
return IRegistry.BIOME.a(base); return MinecraftServer.getServer().aX().b(IRegistry.ay).a(base);
} }
} }