OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to Minecraft 1.16.3

Browse source
This commit is contained in:
md_5 2020-09-11 07:00:00 +10:00
parent 0d8350af4e
commit bf3d720714
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
27 changed files with 67 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nms-patches/CommandListenerWrapper.patch
View file

@ -51,7 +51,7 @@
} }
@@ -252,4 +268,10 @@ @@ -252,4 +268,10 @@
public IRegistryCustom q() { public IRegistryCustom q() {
return this.i.aX(); return this.i.getCustomRegistry();
} }
+ +
+ // CraftBukkit start + // CraftBukkit start

6
nms-patches/DedicatedServer.patch
View file

@ -121,7 +121,7 @@
} }
+ // CraftBukkit start + // CraftBukkit start
+ this.a((PlayerList) (new DedicatedPlayerList(this, this.f, this.worldNBTStorage))); + this.a((PlayerList) (new DedicatedPlayerList(this, this.customRegistry, this.worldNBTStorage)));
+ server.loadPlugins(); + server.loadPlugins();
+ server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP); + server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.STARTUP);
+ // CraftBukkit end + // CraftBukkit end
@ -133,8 +133,8 @@
if (!NameReferencingFileConverter.e(this)) { if (!NameReferencingFileConverter.e(this)) {
return false; return false;
} else { } else {
- this.a((PlayerList) (new DedicatedPlayerList(this, this.f, this.worldNBTStorage))); - this.a((PlayerList) (new DedicatedPlayerList(this, this.customRegistry, this.worldNBTStorage)));
+ // this.a((PlayerList) (new DedicatedPlayerList(this, this.f, this.worldNBTStorage))); // CraftBukkit - moved up + // this.a((PlayerList) (new DedicatedPlayerList(this, this.customRegistry, this.worldNBTStorage))); // CraftBukkit - moved up
long i = SystemUtils.getMonotonicNanos(); long i = SystemUtils.getMonotonicNanos();
this.c(dedicatedserverproperties.maxBuildHeight); this.c(dedicatedserverproperties.maxBuildHeight);

2
nms-patches/Entity.patch
View file

@ -607,7 +607,7 @@
+ // CraftBukkit end + // CraftBukkit end
this.world.getMethodProfiler().enter("reposition"); this.world.getMethodProfiler().enter("reposition");
- ShapeDetectorShape shapedetectorshape = this.a(worldserver); - ShapeDetectorShape shapedetectorshape = this.a(worldserver);
+ ShapeDetectorShape shapedetectorshape = (location == null) ? this.a(worldserver) : new ShapeDetectorShape(new Vec3D(location.getX(), location.getY(), location.getZ()), Vec3D.a, this.yaw, this.pitch, worldserver, null); // CraftBukkit + ShapeDetectorShape shapedetectorshape = (location == null) ? this.a(worldserver) : new ShapeDetectorShape(new Vec3D(location.getX(), location.getY(), location.getZ()), Vec3D.ORIGIN, this.yaw, this.pitch, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) { if (shapedetectorshape == null) {
return null; return null;

9
nms-patches/EntityArmorStand.patch
View file

@ -16,15 +16,6 @@
public class EntityArmorStand extends EntityLiving { public class EntityArmorStand extends EntityLiving {
private static final Vector3f bj = new Vector3f(0.0F, 0.0F, 0.0F); private static final Vector3f bj = new Vector3f(0.0F, 0.0F, 0.0F);
@@ -29,7 +38,7 @@
private final NonNullList<ItemStack> armorItems;
private boolean armorStandInvisible;
public long bi;
- private int bv;
+ public int bv; //PAIL private -> public, rename disabledSlots
public Vector3f headPose;
public Vector3f bodyPose;
public Vector3f leftArmPose;
@@ -55,6 +64,13 @@ @@ -55,6 +64,13 @@
this.setPosition(d0, d1, d2); this.setPosition(d0, d1, d2);
} }

2
nms-patches/EntityBoat.patch
View file

@ -106,7 +106,7 @@
public void tick() { public void tick() {
this.ay = this.ax; this.ay = this.ax;
@@ -225,6 +285,22 @@ @@ -225,6 +285,22 @@
this.setMot(Vec3D.a); this.setMot(Vec3D.ORIGIN);
} }
+ // CraftBukkit start + // CraftBukkit start

2
nms-patches/EntityCow.patch
View file

@ -24,7 +24,7 @@
+ // CraftBukkit end + // CraftBukkit end
+ +
entityhuman.playSound(SoundEffects.ENTITY_COW_MILK, 1.0F, 1.0F); entityhuman.playSound(SoundEffects.ENTITY_COW_MILK, 1.0F, 1.0F);
- ItemStack itemstack1 = ItemLiquidUtil.a(itemstack, entityhuman, Items.MILK_BUCKET.r()); - ItemStack itemstack1 = ItemLiquidUtil.a(itemstack, entityhuman, Items.MILK_BUCKET.createItemStack());
+ ItemStack itemstack1 = ItemLiquidUtil.a(itemstack, entityhuman, CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit + ItemStack itemstack1 = ItemLiquidUtil.a(itemstack, entityhuman, CraftItemStack.asNMSCopy(event.getItemStack())); // CraftBukkit
entityhuman.a(enumhand, itemstack1); entityhuman.a(enumhand, itemstack1);

6
nms-patches/EntityEnderSignal.patch
View file

@ -3,7 +3,7 @@
@@ -20,8 +20,8 @@ @@ -20,8 +20,8 @@
} }
public void b(ItemStack itemstack) { public void setItem(ItemStack itemstack) {
- if (itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) { - if (itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) {
- this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a((Object) itemstack.cloneItemStack(), (itemstack1) -> { - this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a((Object) itemstack.cloneItemStack(), (itemstack1) -> {
+ if (true || itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) { // CraftBukkit - always allow item changing + if (true || itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) { // CraftBukkit - always allow item changing
@ -15,8 +15,8 @@
public void loadData(NBTTagCompound nbttagcompound) { public void loadData(NBTTagCompound nbttagcompound) {
ItemStack itemstack = ItemStack.a(nbttagcompound.getCompound("Item")); ItemStack itemstack = ItemStack.a(nbttagcompound.getCompound("Item"));
- this.b(itemstack); - this.setItem(itemstack);
+ if (!itemstack.isEmpty()) this.b(itemstack); // CraftBukkit - SPIGOT-6103 summon, see also SPIGOT-5474 + if (!itemstack.isEmpty()) this.setItem(itemstack); // CraftBukkit - SPIGOT-6103 summon, see also SPIGOT-5474
} }
@Override @Override

2
nms-patches/EntityIllagerWizard.patch
View file

@ -5,7 +5,7 @@
--this.b; --this.b;
if (this.b == 0) { if (this.b == 0) {
+ // CraftBukkit start + // CraftBukkit start
+ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleEntitySpellCastEvent(EntityIllagerWizard.this, l())) { // PAIL rename getSpell + if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleEntitySpellCastEvent(EntityIllagerWizard.this, this.getCastSpell())) {
+ return; + return;
+ } + }
+ // CraftBukkit end + // CraftBukkit end

28
nms-patches/EntityInsentient.patch
View file

@ -209,15 +209,7 @@
this.world.getMethodProfiler().enter("sensing"); this.world.getMethodProfiler().enter("sensing");
this.bo.a(); this.bo.a();
this.world.getMethodProfiler().exit(); this.world.getMethodProfiler().exit();
@@ -807,6 +890,7 @@ @@ -1024,6 +1107,12 @@
this.a(itemstack);
}
+ this.setSlot(enumitemslot, ItemStack.b); // CraftBukkit - SPIGOT-6109
}
}
@@ -1023,6 +1107,12 @@
if (!this.isAlive()) { if (!this.isAlive()) {
return EnumInteractionResult.PASS; return EnumInteractionResult.PASS;
} else if (this.getLeashHolder() == entityhuman) { } else if (this.getLeashHolder() == entityhuman) {
@ -230,7 +222,7 @@
this.unleash(true, !entityhuman.abilities.canInstantlyBuild); this.unleash(true, !entityhuman.abilities.canInstantlyBuild);
return EnumInteractionResult.a(this.world.isClientSide); return EnumInteractionResult.a(this.world.isClientSide);
} else { } else {
@@ -1041,6 +1131,12 @@ @@ -1042,6 +1131,12 @@
ItemStack itemstack = entityhuman.b(enumhand); ItemStack itemstack = entityhuman.b(enumhand);
if (itemstack.getItem() == Items.LEAD && this.a(entityhuman)) { if (itemstack.getItem() == Items.LEAD && this.a(entityhuman)) {
@ -243,7 +235,7 @@
this.setLeashHolder(entityhuman, true); this.setLeashHolder(entityhuman, true);
itemstack.subtract(1); itemstack.subtract(1);
return EnumInteractionResult.a(this.world.isClientSide); return EnumInteractionResult.a(this.world.isClientSide);
@@ -1056,7 +1152,7 @@ @@ -1057,7 +1152,7 @@
if (itemstack.getItem() instanceof ItemMonsterEgg) { if (itemstack.getItem() instanceof ItemMonsterEgg) {
if (this.world instanceof WorldServer) { if (this.world instanceof WorldServer) {
ItemMonsterEgg itemmonsteregg = (ItemMonsterEgg) itemstack.getItem(); ItemMonsterEgg itemmonsteregg = (ItemMonsterEgg) itemstack.getItem();
@ -252,7 +244,7 @@
optional.ifPresent((entityinsentient) -> { optional.ifPresent((entityinsentient) -> {
this.a(entityhuman, entityinsentient); this.a(entityhuman, entityinsentient);
@@ -1102,12 +1198,19 @@ @@ -1103,12 +1198,19 @@
return this.bA != -1.0F; return this.bA != -1.0F;
} }
@ -273,7 +265,7 @@
t0.u(this); t0.u(this);
t0.setBaby(this.isBaby()); t0.setBaby(this.isBaby());
@@ -1139,7 +1242,12 @@ @@ -1140,7 +1242,12 @@
} }
} }
@ -287,7 +279,7 @@
if (this.isPassenger()) { if (this.isPassenger()) {
Entity entity = this.getVehicle(); Entity entity = this.getVehicle();
@@ -1159,6 +1267,7 @@ @@ -1160,6 +1267,7 @@
if (this.leashHolder != null) { if (this.leashHolder != null) {
if (!this.isAlive() || !this.leashHolder.isAlive()) { if (!this.isAlive() || !this.leashHolder.isAlive()) {
@ -295,7 +287,7 @@
this.unleash(true, true); this.unleash(true, true);
} }
@@ -1175,7 +1284,9 @@ @@ -1176,7 +1284,9 @@
this.leashHolder = null; this.leashHolder = null;
this.by = null; this.by = null;
if (!this.world.isClientSide && flag1) { if (!this.world.isClientSide && flag1) {
@ -305,7 +297,7 @@
} }
if (!this.world.isClientSide && flag && this.world instanceof WorldServer) { if (!this.world.isClientSide && flag && this.world instanceof WorldServer) {
@@ -1225,6 +1336,7 @@ @@ -1226,6 +1336,7 @@
boolean flag1 = super.a(entity, flag); boolean flag1 = super.a(entity, flag);
if (flag1 && this.isLeashed()) { if (flag1 && this.isLeashed()) {
@ -313,7 +305,7 @@
this.unleash(true, true); this.unleash(true, true);
} }
@@ -1357,7 +1469,14 @@ @@ -1358,7 +1469,14 @@
int i = EnchantmentManager.getFireAspectEnchantmentLevel(this); int i = EnchantmentManager.getFireAspectEnchantmentLevel(this);
if (i > 0) { if (i > 0) {
@ -329,7 +321,7 @@
} }
boolean flag = entity.damageEntity(DamageSource.mobAttack(this), f); boolean flag = entity.damageEntity(DamageSource.mobAttack(this), f);
@@ -1419,6 +1538,7 @@ @@ -1420,6 +1538,7 @@
@Override @Override
protected void bM() { protected void bM() {
super.bM(); super.bM();

29
nms-patches/EntityLiving.patch
View file

@ -28,15 +28,6 @@
public abstract class EntityLiving extends Entity { public abstract class EntityLiving extends Entity {
private static final UUID b = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D"); private static final UUID b = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D");
@@ -30,7 +51,7 @@
public static final DataWatcherObject<Float> HEALTH = DataWatcher.a(EntityLiving.class, DataWatcherRegistry.c);
private static final DataWatcherObject<Integer> f = DataWatcher.a(EntityLiving.class, DataWatcherRegistry.b);
private static final DataWatcherObject<Boolean> g = DataWatcher.a(EntityLiving.class, DataWatcherRegistry.i);
- private static final DataWatcherObject<Integer> bh = DataWatcher.a(EntityLiving.class, DataWatcherRegistry.b);
+ public static final DataWatcherObject<Integer> bh = DataWatcher.a(EntityLiving.class, DataWatcherRegistry.b); // PAIL private -> public, rename ARROWS_IN_BODY
private static final DataWatcherObject<Integer> bi = DataWatcher.a(EntityLiving.class, DataWatcherRegistry.b);
private static final DataWatcherObject<Optional<BlockPosition>> bj = DataWatcher.a(EntityLiving.class, DataWatcherRegistry.m);
protected static final EntitySize ah = EntitySize.c(0.2F, 0.2F);
@@ -106,6 +127,21 @@ @@ -106,6 +127,21 @@
private float bB; private float bB;
private float bC; private float bC;
@ -752,7 +743,7 @@
} }
public final void setArrowCount(int i) { public final void setArrowCount(int i) {
- this.datawatcher.set(EntityLiving.bh, i); - this.datawatcher.set(EntityLiving.ARROWS_IN_BODY, i);
+ // CraftBukkit start + // CraftBukkit start
+ setArrowCount(i, false); + setArrowCount(i, false);
} }
@ -762,14 +753,14 @@
+ if (event.isCancelled()) { + if (event.isCancelled()) {
+ return; + return;
+ } + }
+ this.datawatcher.set(EntityLiving.bh, event.getNewAmount()); + this.datawatcher.set(EntityLiving.ARROWS_IN_BODY, event.getNewAmount());
+ } + }
+ // CraftBukkit end + // CraftBukkit end
+ +
public final int dy() { public final int dy() {
return (Integer) this.datawatcher.get(EntityLiving.bi); return (Integer) this.datawatcher.get(EntityLiving.bi);
} }
@@ -1815,6 +2222,7 @@ @@ -1816,6 +2223,7 @@
} }
if (this.onGround && !this.world.isClientSide) { if (this.onGround && !this.world.isClientSide) {
@ -777,7 +768,7 @@
this.setFlag(7, false); this.setFlag(7, false);
} }
} else { } else {
@@ -2320,6 +2728,7 @@ @@ -2321,6 +2729,7 @@
} }
if (!this.world.isClientSide) { if (!this.world.isClientSide) {
@ -785,7 +776,7 @@
this.setFlag(7, flag); this.setFlag(7, flag);
} }
@@ -2440,6 +2849,7 @@ @@ -2441,6 +2850,7 @@
} }
public boolean hasLineOfSight(Entity entity) { public boolean hasLineOfSight(Entity entity) {
@ -793,7 +784,7 @@
Vec3D vec3d = new Vec3D(this.locX(), this.getHeadY(), this.locZ()); Vec3D vec3d = new Vec3D(this.locX(), this.getHeadY(), this.locZ());
Vec3D vec3d1 = new Vec3D(entity.locX(), entity.getHeadY(), entity.locZ()); Vec3D vec3d1 = new Vec3D(entity.locX(), entity.getHeadY(), entity.locZ());
@@ -2457,14 +2867,21 @@ @@ -2458,14 +2868,21 @@
@Override @Override
public boolean isInteractable() { public boolean isInteractable() {
@ -817,7 +808,7 @@
@Override @Override
protected void velocityChanged() { protected void velocityChanged() {
this.velocityChanged = this.random.nextDouble() >= this.b(GenericAttributes.KNOCKBACK_RESISTANCE); this.velocityChanged = this.random.nextDouble() >= this.b(GenericAttributes.KNOCKBACK_RESISTANCE);
@@ -2657,7 +3074,25 @@ @@ -2658,7 +3075,25 @@
} else { } else {
if (!this.activeItem.isEmpty() && this.isHandRaised()) { if (!this.activeItem.isEmpty() && this.isHandRaised()) {
this.b(this.activeItem, 16); this.b(this.activeItem, 16);
@ -844,7 +835,7 @@
if (itemstack != this.activeItem) { if (itemstack != this.activeItem) {
this.a(enumhand, itemstack); this.a(enumhand, itemstack);
@@ -2749,10 +3184,18 @@ @@ -2750,10 +3185,18 @@
} }
if (flag2) { if (flag2) {
@ -866,7 +857,7 @@
} }
} }
@@ -2849,7 +3292,7 @@ @@ -2850,7 +3293,7 @@
} }
public void entityWakeup() { public void entityWakeup() {
@ -875,7 +866,7 @@
World world = this.world; World world = this.world;
this.world.getClass(); this.world.getClass();
@@ -2920,7 +3363,7 @@ @@ -2921,7 +3364,7 @@
Pair<MobEffect, Float> pair = (Pair) iterator.next(); Pair<MobEffect, Float> pair = (Pair) iterator.next();
if (!world.isClientSide && pair.getFirst() != null && world.random.nextFloat() < (Float) pair.getSecond()) { if (!world.isClientSide && pair.getFirst() != null && world.random.nextFloat() < (Float) pair.getSecond()) {

4
nms-patches/EntityPlayer.patch
View file

@ -370,8 +370,8 @@
+ if (shapedetectorshape != null && this.world.getTypeKey() == DimensionManager.OVERWORLD && worldserver != null && worldserver.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit + if (shapedetectorshape != null && this.world.getTypeKey() == DimensionManager.OVERWORLD && worldserver != null && worldserver.getTypeKey() == DimensionManager.THE_END) { // CraftBukkit
Vec3D vec3d = shapedetectorshape.position.add(0.0D, -1.0D, 0.0D); Vec3D vec3d = shapedetectorshape.position.add(0.0D, -1.0D, 0.0D);
- return new ShapeDetectorShape(vec3d, Vec3D.a, 90.0F, 0.0F); - return new ShapeDetectorShape(vec3d, Vec3D.ORIGIN, 90.0F, 0.0F);
+ return new ShapeDetectorShape(vec3d, Vec3D.a, 90.0F, 0.0F, worldserver, shapedetectorshape.portalEventInfo); // CraftBukkit + return new ShapeDetectorShape(vec3d, Vec3D.ORIGIN, 90.0F, 0.0F, worldserver, shapedetectorshape.portalEventInfo); // CraftBukkit
} else { } else {
return shapedetectorshape; return shapedetectorshape;
} }

2
nms-patches/EntityTrackerEntry.patch
View file

@ -23,7 +23,7 @@
+ public EntityTrackerEntry(WorldServer worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<EntityPlayer> trackedPlayers) { + public EntityTrackerEntry(WorldServer worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<EntityPlayer> trackedPlayers) {
+ this.trackedPlayers = trackedPlayers; + this.trackedPlayers = trackedPlayers;
+ // CraftBukkit end + // CraftBukkit end
this.m = Vec3D.a; this.m = Vec3D.ORIGIN;
this.p = Collections.emptyList(); this.p = Collections.emptyList();
this.b = worldserver; this.b = worldserver;
@@ -52,16 +61,17 @@ @@ -52,16 +61,17 @@

11
nms-patches/ItemActionContext.patch
View file

@ -1,11 +0,0 @@
--- a/net/minecraft/server/ItemActionContext.java
+++ b/net/minecraft/server/ItemActionContext.java
@@ -15,7 +15,7 @@
this(entityhuman.world, entityhuman, enumhand, entityhuman.b(enumhand), movingobjectpositionblock);
}
- protected ItemActionContext(World world, @Nullable EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack, MovingObjectPositionBlock movingobjectpositionblock) {
+ public ItemActionContext(World world, @Nullable EntityHuman entityhuman, EnumHand enumhand, ItemStack itemstack, MovingObjectPositionBlock movingobjectpositionblock) { // PAIL protected -> public
this.a = entityhuman;
this.b = enumhand;
this.c = movingobjectpositionblock;

2
nms-patches/ItemEnderEye.patch
View file

@ -2,7 +2,7 @@
+++ b/net/minecraft/server/ItemEnderEye.java +++ b/net/minecraft/server/ItemEnderEye.java
@@ -61,7 +61,11 @@ @@ -61,7 +61,11 @@
entityendersignal.b(itemstack); entityendersignal.setItem(itemstack);
entityendersignal.a(blockposition); entityendersignal.a(blockposition);
- world.addEntity(entityendersignal); - world.addEntity(entityendersignal);
+ // CraftBukkit start + // CraftBukkit start

21
nms-patches/MinecraftServer.patch
View file

@ -25,15 +25,6 @@
public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable { public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable {
@@ -73,7 +84,7 @@
public final DataFixer dataConverterManager;
private String serverIp;
private int serverPort;
- protected final IRegistryCustom.Dimension f;
+ public final IRegistryCustom.Dimension f;
public final Map<ResourceKey<World>, WorldServer> worldServer;
private PlayerList playerList;
private volatile boolean isRunning;
@@ -124,6 +135,20 @@ @@ -124,6 +135,20 @@
private final DefinedStructureManager ak; private final DefinedStructureManager ak;
protected SaveData saveData; protected SaveData saveData;
@ -211,7 +202,7 @@
+ +
+ org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name); + org.bukkit.generator.ChunkGenerator gen = this.server.getGenerator(name);
+ +
+ IRegistryCustom.Dimension iregistrycustom_dimension = this.f; + IRegistryCustom.Dimension iregistrycustom_dimension = this.customRegistry;
+ +
+ RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a((DynamicOps) DynamicOpsNBT.a, this.dataPackResources.h(), iregistrycustom_dimension); + RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a((DynamicOps) DynamicOpsNBT.a, this.dataPackResources.h(), iregistrycustom_dimension);
+ worlddata = (WorldDataServer) worldSession.a((DynamicOps) registryreadops, datapackconfiguration); + worlddata = (WorldDataServer) worldSession.a((DynamicOps) registryreadops, datapackconfiguration);
@ -252,8 +243,8 @@
+ ChunkGenerator chunkgenerator; + ChunkGenerator chunkgenerator;
+ +
+ if (worlddimension == null) { + if (worlddimension == null) {
+ dimensionmanager = (DimensionManager) this.f.a().d(DimensionManager.OVERWORLD); + dimensionmanager = (DimensionManager) this.customRegistry.a().d(DimensionManager.OVERWORLD);
+ chunkgenerator = GeneratorSettings.a(this.f.b(IRegistry.ay), this.f.b(IRegistry.ar), (new Random()).nextLong()); + chunkgenerator = GeneratorSettings.a(customRegistry.b(IRegistry.ay), customRegistry.b(IRegistry.ar), (new Random()).nextLong());
+ } else { + } else {
+ dimensionmanager = worlddimension.b(); + dimensionmanager = worlddimension.b();
+ chunkgenerator = worlddimension.c(); + chunkgenerator = worlddimension.c();
@ -320,8 +311,8 @@
- Object object; - Object object;
- -
- if (worlddimension == null) { - if (worlddimension == null) {
- dimensionmanager = (DimensionManager) this.f.a().d(DimensionManager.OVERWORLD); - dimensionmanager = (DimensionManager) this.customRegistry.a().d(DimensionManager.OVERWORLD);
- object = GeneratorSettings.a(this.f.b(IRegistry.ay), this.f.b(IRegistry.ar), (new Random()).nextLong()); - object = GeneratorSettings.a(this.customRegistry.b(IRegistry.ay), this.customRegistry.b(IRegistry.ar), (new Random()).nextLong());
- } else { - } else {
- dimensionmanager = worlddimension.b(); - dimensionmanager = worlddimension.b();
- object = worlddimension.c(); - object = worlddimension.c();
@ -475,7 +466,7 @@
iworlddataserver.a(worldserver1.getWorldBorder().t()); iworlddataserver.a(worldserver1.getWorldBorder().t());
this.saveData.setCustomBossEvents(this.getBossBattleCustomData().save()); this.saveData.setCustomBossEvents(this.getBossBattleCustomData().save());
this.convertable.a(this.f, this.saveData, this.getPlayerList().save()); this.convertable.a(this.customRegistry, this.saveData, this.getPlayerList().save());
+ */ + */
+ // CraftBukkit end + // CraftBukkit end
return flag3; return flag3;

4
nms-patches/TileEntityBarrel.patch
View file

@ -60,8 +60,8 @@
return; return;
} }
- boolean flag = (Boolean) iblockdata.get(BlockBarrel.b); - boolean flag = (Boolean) iblockdata.get(BlockBarrel.OPEN);
+ boolean flag = (Boolean) iblockdata.get(BlockBarrel.b) && !opened; // CraftBukkit - only set flag if Barrel isn't set open by API. + boolean flag = (Boolean) iblockdata.get(BlockBarrel.OPEN) && !opened; // CraftBukkit - only set flag if Barrel isn't set open by API.
if (flag) { if (flag) {
this.playOpenSound(iblockdata, SoundEffects.BLOCK_BARREL_CLOSE); this.playOpenSound(iblockdata, SoundEffects.BLOCK_BARREL_CLOSE);

2
nms-patches/World.patch
View file

@ -62,7 +62,7 @@
+ this.ticksPerWaterSpawns = this.getServer().getTicksPerWaterSpawns(); // CraftBukkit + this.ticksPerWaterSpawns = this.getServer().getTicksPerWaterSpawns(); // CraftBukkit
+ this.ticksPerWaterAmbientSpawns = this.getServer().getTicksPerWaterAmbientSpawns(); // CraftBukkit + this.ticksPerWaterAmbientSpawns = this.getServer().getTicksPerWaterAmbientSpawns(); // CraftBukkit
+ this.ticksPerAmbientSpawns = this.getServer().getTicksPerAmbientSpawns(); // CraftBukkit + this.ticksPerAmbientSpawns = this.getServer().getTicksPerAmbientSpawns(); // CraftBukkit
+ this.typeKey = (ResourceKey) this.getServer().getHandle().getServer().f.a().c(dimensionmanager).orElseThrow(() -> { + this.typeKey = (ResourceKey) this.getServer().getHandle().getServer().customRegistry.a().c(dimensionmanager).orElseThrow(() -> {
+ return new IllegalStateException("Unregistered dimension type: " + dimensionmanager); + return new IllegalStateException("Unregistered dimension type: " + dimensionmanager);
+ }); + });
+ // CraftBukkit end + // CraftBukkit end

2
nms-patches/WorldServer.patch
View file

@ -319,7 +319,7 @@
+ +
+ worldDataServer.a(worldserver1.getWorldBorder().t()); + worldDataServer.a(worldserver1.getWorldBorder().t());
+ worldDataServer.setCustomBossEvents(this.server.getBossBattleCustomData().save()); + worldDataServer.setCustomBossEvents(this.server.getBossBattleCustomData().save());
+ convertable.a(this.server.f, this.worldDataServer, this.server.getPlayerList().save()); + convertable.a(this.server.customRegistry, this.worldDataServer, this.server.getPlayerList().save());
+ // CraftBukkit end + // CraftBukkit end
} }

4
pom.xml
View file

@ -4,7 +4,7 @@
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>craftbukkit</artifactId> <artifactId>craftbukkit</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.16.2-R0.1-SNAPSHOT</version> <version>1.16.3-R0.1-SNAPSHOT</version>
<name>CraftBukkit</name> <name>CraftBukkit</name>
<url>https://www.spigotmc.org/</url> <url>https://www.spigotmc.org/</url>
@ -12,7 +12,7 @@
<skipTests>true</skipTests> <skipTests>true</skipTests>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version> <api.version>unknown</api.version>
<minecraft.version>1.16.2</minecraft.version> <minecraft.version>1.16.3</minecraft.version>
<minecraft_version>1_16_R2</minecraft_version> <minecraft_version>1_16_R2</minecraft_version>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>

10
src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -751,7 +751,7 @@ public final class CraftServer implements Server {
configuration = YamlConfiguration.loadConfiguration(getConfigFile()); configuration = YamlConfiguration.loadConfiguration(getConfigFile());
commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile()); commandsConfiguration = YamlConfiguration.loadConfiguration(getCommandsConfigFile());
console.propertyManager = new DedicatedServerSettings(console.aX(), console.options); console.propertyManager = new DedicatedServerSettings(console.getCustomRegistry(), console.options);
DedicatedServerProperties config = console.propertyManager.getProperties(); DedicatedServerProperties config = console.propertyManager.getProperties();
console.setPVP(config.pvp); console.setPVP(config.pvp);
@ -983,7 +983,7 @@ public final class CraftServer implements Server {
boolean hardcore = creator.hardcore(); boolean hardcore = creator.hardcore();
RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a((DynamicOps) DynamicOpsNBT.a, console.dataPackResources.h(), console.f); RegistryReadOps<NBTBase> registryreadops = RegistryReadOps.a((DynamicOps) DynamicOpsNBT.a, console.dataPackResources.h(), console.customRegistry);
WorldDataServer worlddata = (WorldDataServer) worldSession.a((DynamicOps) registryreadops, console.datapackconfiguration); WorldDataServer worlddata = (WorldDataServer) worldSession.a((DynamicOps) registryreadops, console.datapackconfiguration);
WorldSettings worldSettings; WorldSettings worldSettings;
@ -995,7 +995,7 @@ public final class CraftServer implements Server {
properties.put("generate-structures", Objects.toString(creator.generateStructures())); properties.put("generate-structures", Objects.toString(creator.generateStructures()));
properties.put("level-type", Objects.toString(creator.type().getName())); properties.put("level-type", Objects.toString(creator.type().getName()));
GeneratorSettings generatorsettings = GeneratorSettings.a(console.aX(), properties); GeneratorSettings generatorsettings = GeneratorSettings.a(console.getCustomRegistry(), properties);
worldSettings = new WorldSettings(name, EnumGamemode.getById(getDefaultGameMode().getValue()), hardcore, EnumDifficulty.EASY, false, new GameRules(), console.datapackconfiguration); worldSettings = new WorldSettings(name, EnumGamemode.getById(getDefaultGameMode().getValue()), hardcore, EnumDifficulty.EASY, false, new GameRules(), console.datapackconfiguration);
worlddata = new WorldDataServer(worldSettings, generatorsettings, Lifecycle.stable()); worlddata = new WorldDataServer(worldSettings, generatorsettings, Lifecycle.stable());
} }
@ -1018,8 +1018,8 @@ public final class CraftServer implements Server {
net.minecraft.server.ChunkGenerator chunkgenerator; net.minecraft.server.ChunkGenerator chunkgenerator;
if (worlddimension == null) { if (worlddimension == null) {
dimensionmanager = (DimensionManager) console.f.a().d(DimensionManager.OVERWORLD); dimensionmanager = (DimensionManager) console.customRegistry.a().d(DimensionManager.OVERWORLD);
chunkgenerator = GeneratorSettings.a(console.f.b(IRegistry.ay), console.f.b(IRegistry.ar), (new Random()).nextLong()); chunkgenerator = GeneratorSettings.a(console.customRegistry.b(IRegistry.ay), console.customRegistry.b(IRegistry.ar), (new Random()).nextLong());
} else { } else {
dimensionmanager = worlddimension.b(); dimensionmanager = worlddimension.b();
chunkgenerator = worlddimension.c(); chunkgenerator = worlddimension.c();

6
src/main/java/org/bukkit/craftbukkit/Main.java
View file

@ -149,8 +149,8 @@ public class Main {
} }
float javaVersion = Float.parseFloat(System.getProperty("java.class.version")); float javaVersion = Float.parseFloat(System.getProperty("java.class.version"));
if (javaVersion > 58.0) { if (javaVersion > 59.0) {
System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 14 is supported."); System.err.println("Unsupported Java detected (" + javaVersion + "). Only up to Java 15 is supported.");
return; return;
} }
@ -177,7 +177,7 @@ public class Main {
useConsole = false; 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); Date buildDate = new Date(Integer.parseInt(Main.class.getPackage().getImplementationVendor()) * 1000L);
Calendar deadline = Calendar.getInstance(); Calendar deadline = Calendar.getInstance();

2
src/main/java/org/bukkit/craftbukkit/block/CraftBarrel.java
View file

@ -39,7 +39,7 @@ public class CraftBarrel extends CraftLootable<TileEntityBarrel> implements Barr
requirePlaced(); requirePlaced();
if (!getTileEntity().opened) { if (!getTileEntity().opened) {
IBlockData blockData = getTileEntity().getBlock(); IBlockData blockData = getTileEntity().getBlock();
boolean open = blockData.get(BlockBarrel.b); boolean open = blockData.get(BlockBarrel.OPEN);
if (!open) { if (!open) {
getTileEntity().setOpenFlag(blockData, true); getTileEntity().setOpenFlag(blockData, true);

2
src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View file

@ -636,7 +636,7 @@ public class CraftBlock implements Block {
@Override @Override
public boolean applyBoneMeal(BlockFace face) { public boolean applyBoneMeal(BlockFace face) {
EnumDirection direction = blockFaceToNotch(face); EnumDirection direction = blockFaceToNotch(face);
ItemActionContext context = new ItemActionContext(getCraftWorld().getHandle(), null, EnumHand.MAIN_HAND, Items.BONE_MEAL.r(), new MovingObjectPositionBlock(Vec3D.a, direction, getPosition(), false)); // PAIL rename createItemStack, ZERO ItemActionContext context = new ItemActionContext(getCraftWorld().getHandle(), null, EnumHand.MAIN_HAND, Items.BONE_MEAL.createItemStack(), new MovingObjectPositionBlock(Vec3D.ORIGIN, direction, getPosition(), false));
return ItemBoneMeal.applyBonemeal(context) == EnumInteractionResult.SUCCESS; return ItemBoneMeal.applyBonemeal(context) == EnumInteractionResult.SUCCESS;
} }

6
src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
View file

@ -216,16 +216,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@Override @Override
public void addEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) { public void addEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) {
getHandle().bv |= (1 << CraftEquipmentSlot.getNMS(equipmentSlot).c() + lockType.ordinal() * 8); // PAIL c() rename getSlotFlag() getHandle().disabledSlots |= (1 << CraftEquipmentSlot.getNMS(equipmentSlot).getSlotFlag() + lockType.ordinal() * 8);
} }
@Override @Override
public void removeEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) { public void removeEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) {
getHandle().bv &= ~(1 << CraftEquipmentSlot.getNMS(equipmentSlot).c() + lockType.ordinal() * 8); getHandle().disabledSlots &= ~(1 << CraftEquipmentSlot.getNMS(equipmentSlot).getSlotFlag() + lockType.ordinal() * 8);
} }
@Override @Override
public boolean hasEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) { public boolean hasEquipmentLock(EquipmentSlot equipmentSlot, LockType lockType) {
return (getHandle().bv & (1 << CraftEquipmentSlot.getNMS(equipmentSlot).c() + lockType.ordinal() * 8)) != 0; return (getHandle().disabledSlots & (1 << CraftEquipmentSlot.getNMS(equipmentSlot).getSlotFlag() + lockType.ordinal() * 8)) != 0;
} }
} }

4
src/main/java/org/bukkit/craftbukkit/entity/CraftEnderSignal.java
View file

@ -54,12 +54,12 @@ public class CraftEnderSignal extends CraftEntity implements EnderSignal {
@Override @Override
public ItemStack getItem() { public ItemStack getItem() {
return CraftItemStack.asBukkitCopy(getHandle().g()); // PAIL rename getItemStack return CraftItemStack.asBukkitCopy(getHandle().getItem());
} }
@Override @Override
public void setItem(ItemStack item) { public void setItem(ItemStack item) {
getHandle().b(item != null ? CraftItemStack.asNMSCopy(item) : Items.ENDER_EYE.r()); // PAIL rename setItemStack, createItemStack getHandle().setItem(item != null ? CraftItemStack.asNMSCopy(item) : Items.ENDER_EYE.createItemStack());
} }
@Override @Override

8
src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View file

@ -248,12 +248,12 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override @Override
public int getArrowCooldown() { public int getArrowCooldown() {
return getHandle().al; // PAIL rename arrowCooldown return getHandle().arrowCooldown;
} }
@Override @Override
public void setArrowCooldown(int ticks) { public void setArrowCooldown(int ticks) {
getHandle().al = ticks; getHandle().arrowCooldown = ticks;
} }
@Override @Override
@ -264,7 +264,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override @Override
public void setArrowsInBody(int count) { public void setArrowsInBody(int count) {
Preconditions.checkArgument(count >= 0, "New arrow amount must be >= 0"); Preconditions.checkArgument(count >= 0, "New arrow amount must be >= 0");
getHandle().getDataWatcher().set(EntityLiving.bh, count); getHandle().getDataWatcher().set(EntityLiving.ARROWS_IN_BODY, count);
} }
@Override @Override
@ -669,7 +669,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return EntityCategory.ARTHROPOD; return EntityCategory.ARTHROPOD;
} else if (type == EnumMonsterType.ILLAGER) { } else if (type == EnumMonsterType.ILLAGER) {
return EntityCategory.ILLAGER; return EntityCategory.ILLAGER;
} else if (type == EnumMonsterType.e) { // PAIL rename WATER_MOB } else if (type == EnumMonsterType.WATER_MOB) {
return EntityCategory.WATER; return EntityCategory.WATER;
} }

2
src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View file

@ -204,7 +204,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string * @return string
*/ */
public String getMappingsVersion() { public String getMappingsVersion() {
return "c2d5d7871edcc4fb0f81d18959c647af"; return "09f04031f41cb54f1077c6ac348cc220";
} }
@Override @Override