SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.16.5

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2021-01-16 12:00:00 +11:00
parent 789c080552
commit 78ff16111e
27 changed files with 76 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
View File

@@ -130,7 +130,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
Preconditions.checkState(biome != null, "ChunkSnapshot created without biome. Please call getSnapshot with includeBiome=true");
CraftChunk.validateChunkCoordinates(x, y, z);
return CraftBlock.biomeBaseToBiome((IRegistry<BiomeBase>) biome.g, biome.getBiome(x >> 2, y >> 2, z >> 2));
return CraftBlock.biomeBaseToBiome((IRegistry<BiomeBase>) biome.registry, biome.getBiome(x >> 2, y >> 2, z >> 2));
}
@Override

14
paper-server/src/main/java/org/bukkit/craftbukkit/CraftSoundGroup.java
View File

@@ -24,36 +24,36 @@ public class CraftSoundGroup implements SoundGroup {
@Override
public float getVolume() {
return getHandle().V; // PAIL rename volume
return getHandle().getVolume();
}
@Override
public float getPitch() {
return getHandle().W; // PAIL rename pitch
return getHandle().getPitch();
}
@Override
public Sound getBreakSound() {
return CraftSound.getBukkit(getHandle().X);
return CraftSound.getBukkit(getHandle().breakSound);
}
@Override
public Sound getStepSound() {
return CraftSound.getBukkit(getHandle().d()); // PAIL rename getStepSound
return CraftSound.getBukkit(getHandle().getStepSound());
}
@Override
public Sound getPlaceSound() {
return CraftSound.getBukkit(getHandle().e()); // PAIL rename getPlaceSound
return CraftSound.getBukkit(getHandle().getPlaceSound());
}
@Override
public Sound getHitSound() {
return CraftSound.getBukkit(getHandle().aa);
return CraftSound.getBukkit(getHandle().hitSound);
}
@Override
public Sound getFallSound() {
return CraftSound.getBukkit(getHandle().g()); // PAIL rename getFallSound
return CraftSound.getBukkit(getHandle().getFallSound());
}
}

4
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -1325,12 +1325,12 @@ public class CraftWorld implements World {
@Override
public void setClearWeatherDuration(int duration) {
world.worldDataServer.a(duration); // PAIL rename setClearWeatherDuration
world.worldDataServer.setClearWeatherTime(duration);
}
@Override
public int getClearWeatherDuration() {
return world.worldDataServer.h(); // PAIL rename getClearWeatherDuration
return world.worldDataServer.getClearWeatherTime();
}
@Override

2
paper-server/src/main/java/org/bukkit/craftbukkit/Main.java
View File

@@ -177,7 +177,7 @@ public class Main {
useConsole = false;
}
if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
Calendar deadline = Calendar.getInstance();

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
View File

@@ -72,13 +72,13 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
@Override
public float getItemDropChance() {
return getHandle().ag;
return getHandle().itemDropChance;
}
@Override
public void setItemDropChance(float chance) {
Preconditions.checkArgument(0.0 <= chance && chance <= 1.0, "Chance outside range [0, 1]");
getHandle().ag = chance;
getHandle().itemDropChance = chance;
}
@Override

4
paper-server/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
View File

@@ -67,12 +67,12 @@ public class CustomChunkGenerator extends InternalChunkGenerator {
@Override
public Biome getBiome(int x, int y, int z) {
return CraftBlock.biomeBaseToBiome((IRegistry<BiomeBase>) biome.g, biome.getBiome(x >> 2, y >> 2, z >> 2));
return CraftBlock.biomeBaseToBiome((IRegistry<BiomeBase>) biome.registry, biome.getBiome(x >> 2, y >> 2, z >> 2));
}
@Override
public void setBiome(int x, int y, int z, Biome bio) {
biome.setBiome(x >> 2, y >> 2, z >> 2, CraftBlock.biomeToBiomeBase((IRegistry<BiomeBase>) biome.g, bio));
biome.setBiome(x >> 2, y >> 2, z >> 2, CraftBlock.biomeToBiomeBase((IRegistry<BiomeBase>) biome.registry, bio));
}
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@@ -224,7 +224,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string
*/
public String getMappingsVersion() {
return "da85101b34b252659e3ddf10c0c57cc9";
return "54e89c47309b53737f894f1bf1b0edbe";
}
@Override