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

Update to Minecraft 1.14.4

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-07-20 09:00:00 +10:00
parent fa576e3e73
commit a4b8e8ce68
102 changed files with 678 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
View File

@@ -210,7 +210,7 @@ public final class CraftChatMessage {
ChatModifier modifier = text.getChatModifier() != null ?
text.getChatModifier() : new ChatModifier();
List<IChatBaseComponent> extras = new ArrayList<IChatBaseComponent>();
List<IChatBaseComponent> extrasOld = new ArrayList<IChatBaseComponent>(text.a());
List<IChatBaseComponent> extrasOld = new ArrayList<IChatBaseComponent>(text.getSiblings());
component = text = new ChatComponentText("");
int pos = 0;
@@ -245,21 +245,21 @@ public final class CraftChatMessage {
}
}
List extras = component.a();
List<IChatBaseComponent> extras = component.getSiblings();
for (int i = 0; i < extras.size(); i++) {
IChatBaseComponent comp = (IChatBaseComponent) extras.get(i);
if (comp.getChatModifier() != null && comp.getChatModifier().h() == null) {
IChatBaseComponent comp = extras.get(i);
if (comp.getChatModifier() != null && comp.getChatModifier().getClickEvent() == null) {
extras.set(i, fixComponent(comp, matcher));
}
}
if (component instanceof ChatMessage) {
Object[] subs = ((ChatMessage) component).l();
Object[] subs = ((ChatMessage) component).getArgs();
for (int i = 0; i < subs.length; i++) {
Object comp = subs[i];
if (comp instanceof IChatBaseComponent) {
IChatBaseComponent c = (IChatBaseComponent) comp;
if (c.getChatModifier() != null && c.getChatModifier().h() == null) {
if (c.getChatModifier() != null && c.getChatModifier().getClickEvent() == null) {
subs[i] = fixComponent(c, matcher);
}
} else if (comp instanceof String && matcher.reset((String)comp).find()) {

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

@@ -188,7 +188,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string
*/
public String getMappingsVersion() {
return "a69acbca3007d2ae1b4b69881f0ab9ad";
return "11ae498d9cf909730659b6357e7c2afa";
}
@Override

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

@@ -21,7 +21,7 @@ public final class CraftNamespacedKey {
}
public static NamespacedKey fromMinecraft(MinecraftKey minecraft) {
return new NamespacedKey(minecraft.b(), minecraft.getKey());
return new NamespacedKey(minecraft.getNamespace(), minecraft.getKey());
}
public static MinecraftKey toMinecraft(NamespacedKey key) {

3
paper-server/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
View File

@@ -11,7 +11,6 @@ import net.minecraft.server.ChunkStatus;
import net.minecraft.server.DifficultyDamageScaler;
import net.minecraft.server.Entity;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.EnumDirection;
import net.minecraft.server.EnumSkyBlock;
import net.minecraft.server.Fluid;
import net.minecraft.server.FluidType;
@@ -83,7 +82,7 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public void a(EntityHuman eh, BlockPosition bp, SoundEffect se, SoundCategory sc, float f, float f1) {
public void playSound(EntityHuman eh, BlockPosition bp, SoundEffect se, SoundCategory sc, float f, float f1) {
throw new UnsupportedOperationException("Not supported yet.");
}