SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

SPIGOT-5556: Some biome methods use incorrect positions

Quellcode durchsuchen 
See SPIGOT-5529
Dieser Commit ist enthalten in:
md_5 2020-02-01 17:30:40 +11:00
Ursprung 544ccdc588
Commit e82b5477ae
2 geänderte Dateien mit 6 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
Datei anzeigen

@ -126,7 +126,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
Preconditions.checkState(biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true"); Preconditions.checkState(biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
CraftChunk.validateChunkCoordinates(x, y, z); CraftChunk.validateChunkCoordinates(x, y, z);
return CraftBlock.biomeBaseToBiome(biome.getBiome(x, y, z)); return CraftBlock.biomeBaseToBiome(biome.getBiome(x >> 2, y >> 2, z >> 2));
} }
@Override @Override
@ -139,7 +139,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
Preconditions.checkState(biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true"); Preconditions.checkState(biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
CraftChunk.validateChunkCoordinates(x, y, z); CraftChunk.validateChunkCoordinates(x, y, z);
return biome.getBiome(x, y, z).getAdjustedTemperature(new BlockPosition((this.x << 4) | x, y, (this.z << 4) | z)); return biome.getBiome(x >> 2, y >> 2, z >> 2).getAdjustedTemperature(new BlockPosition((this.x << 4) | x, y, (this.z << 4) | z));
} }
@Override @Override

8
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
Datei anzeigen

@ -901,7 +901,7 @@ public class CraftWorld implements World {
@Override @Override
public Biome getBiome(int x, int y, int z) { public Biome getBiome(int x, int y, int z) {
return CraftBlock.biomeBaseToBiome(this.world.getBiome(new BlockPosition(x, y, z))); return CraftBlock.biomeBaseToBiome(this.world.getBiome(x >> 2, y >> 2, z >> 2));
} }
@Override @Override
@ -919,7 +919,7 @@ public class CraftWorld implements World {
net.minecraft.server.Chunk chunk = this.world.getChunkAtWorldCoords(pos); net.minecraft.server.Chunk chunk = this.world.getChunkAtWorldCoords(pos);
if (chunk != null) { if (chunk != null) {
chunk.getBiomeIndex().setBiome(x, y, z, bb); chunk.getBiomeIndex().setBiome(x >> 2, y >> 2, z >> 2, bb);
chunk.markDirty(); // SPIGOT-2890 chunk.markDirty(); // SPIGOT-2890
} }
@ -934,7 +934,7 @@ public class CraftWorld implements World {
@Override @Override
public double getTemperature(int x, int y, int z) { public double getTemperature(int x, int y, int z) {
BlockPosition pos = new BlockPosition(x, y, z); BlockPosition pos = new BlockPosition(x, y, z);
return this.world.getBiome(pos).getAdjustedTemperature(pos); return this.world.getBiome(x >> 2, y >> 2, z >> 2).getAdjustedTemperature(pos);
} }
@Override @Override
@ -944,7 +944,7 @@ public class CraftWorld implements World {
@Override @Override
public double getHumidity(int x, int y, int z) { public double getHumidity(int x, int y, int z) {
return this.world.getBiome(new BlockPosition(x, y, z)).getHumidity(); return this.world.getBiome(x >> 2, y >> 2, z >> 2).getHumidity();
} }
@Override @Override