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

Update to Minecraft 1.16.2

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-08-12 07:00:00 +10:00
parent 5e5f7f19dc
commit 6a9e00d4b6
208 changed files with 2144 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,11 +45,11 @@ public final class CraftChatMessage {
// Separate pattern with no group 3, new lines are part of previous string
private static final Pattern INCREMENTAL_PATTERN_KEEP_NEWLINES = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-orx])|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " ]|$))))", Pattern.CASE_INSENSITIVE);
// ChatColor.b does not explicitly reset, its more of empty
private static final ChatModifier RESET = ChatModifier.b.setBold(false).setItalic(false).setUnderline(false).setStrikethrough(false).setRandom(false);
private static final ChatModifier RESET = ChatModifier.a.setBold(false).setItalic(false).setUnderline(false).setStrikethrough(false).setRandom(false);
private final List<IChatBaseComponent> list = new ArrayList<IChatBaseComponent>();
private IChatMutableComponent currentChatComponent = new ChatComponentText("");
private ChatModifier modifier = ChatModifier.b;
private ChatModifier modifier = ChatModifier.a;
private final IChatBaseComponent[] output;
private int currentIndex;
private StringBuilder hex;

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

@@ -204,7 +204,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string
*/
public String getMappingsVersion() {
return "25afc67716a170ea965092c1067ff439";
return "c2d5d7871edcc4fb0f81d18959c647af";
}
@Override
@@ -240,7 +240,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
JsonElement jsonelement = AdvancementDataWorld.DESERIALIZER.fromJson(advancement, JsonElement.class);
JsonObject jsonobject = ChatDeserializer.m(jsonelement, "advancement");
net.minecraft.server.Advancement.SerializedAdvancement nms = net.minecraft.server.Advancement.SerializedAdvancement.a(jsonobject, new LootDeserializationContext(minecraftkey, MinecraftServer.getServer().aI()));
net.minecraft.server.Advancement.SerializedAdvancement nms = net.minecraft.server.Advancement.SerializedAdvancement.a(jsonobject, new LootDeserializationContext(minecraftkey, MinecraftServer.getServer().getLootPredicateManager()));
if (nms != null) {
MinecraftServer.getServer().getAdvancementData().REGISTRY.a(Maps.newHashMap(Collections.singletonMap(minecraftkey, nms)));
Advancement bukkit = Bukkit.getAdvancement(key);

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

@@ -20,16 +20,16 @@ import net.minecraft.server.HeightMap;
import net.minecraft.server.IBlockData;
import net.minecraft.server.IChunkAccess;
import net.minecraft.server.IChunkProvider;
import net.minecraft.server.IRegistryCustom;
import net.minecraft.server.LightEngine;
import net.minecraft.server.ParticleParam;
import net.minecraft.server.SoundCategory;
import net.minecraft.server.SoundEffect;
import net.minecraft.server.TickList;
import net.minecraft.server.TickListEmpty;
import net.minecraft.server.TileEntity;
import net.minecraft.server.World;
import net.minecraft.server.WorldBorder;
import net.minecraft.server.WorldData;
import net.minecraft.server.WorldServer;
public class DummyGeneratorAccess implements GeneratorAccess {
@@ -40,16 +40,11 @@ public class DummyGeneratorAccess implements GeneratorAccess {
@Override
public TickList<Block> getBlockTickList() {
return TickListEmpty.b();
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public TickList<FluidType> getFluidTickList() {
return TickListEmpty.b();
}
@Override
public World getMinecraftWorld() {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -59,7 +54,7 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public DifficultyDamageScaler getDamageScaler(BlockPosition bp) {
public DifficultyDamageScaler getDamageScaler(BlockPosition blockposition) {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -74,17 +69,27 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public void playSound(EntityHuman eh, BlockPosition bp, SoundEffect se, SoundCategory sc, float f, float f1) {
public void playSound(EntityHuman entityhuman, BlockPosition blockposition, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void addParticle(ParticleParam pp, double d, double d1, double d2, double d3, double d4, double d5) {
public void addParticle(ParticleParam particleparam, double d0, double d1, double d2, double d3, double d4, double d5) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void a(EntityHuman eh, int i, BlockPosition bp, int i1) {
public void a(EntityHuman entityhuman, int i, BlockPosition blockposition, int j) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public WorldServer getMinecraftWorld() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public IRegistryCustom r() {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -187,4 +192,9 @@ public class DummyGeneratorAccess implements GeneratorAccess {
public boolean a(BlockPosition blockposition, boolean flag, Entity entity, int i) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public long ab() {
throw new UnsupportedOperationException("Not supported yet.");
}
}