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

Update to Minecraft 1.14.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-05-28 06:30:00 +10:00
parent 5f2275f40a
commit 569660215f
57 changed files with 385 additions and 394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,7 @@ public class CraftLootTable implements org.bukkit.loot.LootTable {
builder.set(LootContextParameters.DAMAGE_SOURCE, DamageSource.playerAttack(nmsKiller));
}
return builder.build(getHandle().a());
return builder.build(getHandle().getLootContextParameterSet());
}
@Override

7
paper-server/src/main/java/org/bukkit/craftbukkit/entity/memory/CraftMemoryMapper.java
View File

@@ -30,13 +30,10 @@ public final class CraftMemoryMapper {
}
public static Location fromNms(GlobalPos globalPos) {
// PAIL: globalPos.a() -> getDimensionManager()
// PAIL: globalPos.b() -> getBlockPosition()
return new org.bukkit.Location(((CraftServer) Bukkit.getServer()).getServer().getWorldServer(globalPos.a()).getWorld(), globalPos.b().getX(), globalPos.b().getY(), globalPos.b().getZ());
return new org.bukkit.Location(((CraftServer) Bukkit.getServer()).getServer().getWorldServer(globalPos.getDimensionManager()).getWorld(), globalPos.getBlockPosition().getX(), globalPos.getBlockPosition().getY(), globalPos.getBlockPosition().getZ());
}
public static GlobalPos toNms(Location location) {
// PAIL: GlobalPos.a(DmensionManager, BlockPosition) -> create()
return GlobalPos.a(((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager(), new BlockPosition(location.getX(), location.getY(), location.getZ()));
return GlobalPos.create(((CraftWorld) location.getWorld()).getHandle().getWorldProvider().getDimensionManager(), new BlockPosition(location.getX(), location.getY(), location.getZ()));
}
}

7
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantCustom.java
View File

@@ -7,6 +7,8 @@ import net.minecraft.server.IMerchant;
import net.minecraft.server.ItemStack;
import net.minecraft.server.MerchantRecipe;
import net.minecraft.server.MerchantRecipeList;
import net.minecraft.server.SoundEffect;
import net.minecraft.server.SoundEffects;
import net.minecraft.server.World;
import org.apache.commons.lang.Validate;
@@ -95,5 +97,10 @@ public class CraftMerchantCustom extends CraftMerchant {
public boolean ea() {
return true;
}
@Override
public SoundEffect eb() {
return SoundEffects.ENTITY_VILLAGER_YES;
}
}
}

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

@@ -186,7 +186,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string
*/
public String getMappingsVersion() {
return "48be70f51ffe914d865f175ed3bf992d";
return "28fc84e92753a1f24483290e13e0ee4c";
}
@Override