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

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
View File

@@ -94,6 +94,8 @@ import net.minecraft.server.EntityPhantom;
import net.minecraft.server.EntityPig;
import net.minecraft.server.EntityPigZombie;
import net.minecraft.server.EntityPiglin;
import net.minecraft.server.EntityPiglinAbstract;
import net.minecraft.server.EntityPiglinBrute;
import net.minecraft.server.EntityPillager;
import net.minecraft.server.EntityPlayer;
import net.minecraft.server.EntityPolarBear;
@@ -284,7 +286,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
else { return new CraftIllager(server, (EntityIllagerAbstract) entity); }
}
else if (entity instanceof EntityRavager) { return new CraftRavager(server, (EntityRavager) entity); }
else if (entity instanceof EntityPiglin) { return new CraftPiglin(server, (EntityPiglin) entity); }
else if (entity instanceof EntityPiglinAbstract) {
if (entity instanceof EntityPiglin) return new CraftPiglin(server, (EntityPiglin) entity);
else if (entity instanceof EntityPiglinBrute) { return new CraftPiglinBrute(server, (EntityPiglinBrute) entity); }
else { return new CraftPiglinAbstract(server, (EntityPiglinAbstract) entity); }
}
else if (entity instanceof EntityZoglin) { return new CraftZoglin(server, (EntityZoglin) entity); }
else { return new CraftMonster(server, (EntityMonster) entity); }

18
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHoglin.java
View File

@@ -14,43 +14,43 @@ public class CraftHoglin extends CraftAnimals implements Hoglin {
@Override
public boolean isImmuneToZombification() {
return getHandle().eW();
return getHandle().isImmuneToZombification();
}
@Override
public void setImmuneToZombification(boolean flag) {
getHandle().t(flag);
getHandle().setImmuneToZombification(flag);
}
@Override
public boolean isAbleToBeHunted() {
return getHandle().bA;
return getHandle().cannotBeHunted;
}
@Override
public void setIsAbleToBeHunted(boolean flag) {
getHandle().bA = flag;
getHandle().cannotBeHunted = flag;
}
@Override
public int getConversionTime() {
Preconditions.checkState(isConverting(), "Entity not converting");
return getHandle().bz;
return getHandle().conversionTicks;
}
@Override
public void setConversionTime(int time) {
if (time < 0) {
getHandle().bz = -1;
getHandle().t(false);
getHandle().conversionTicks = -1;
getHandle().setImmuneToZombification(false);
} else {
getHandle().bz = time;
getHandle().conversionTicks = time;
}
}
@Override
public boolean isConverting() {
return getHandle().eO(); // PAIL rename isConverting()
return getHandle().isConverting();
}
@Override

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

@@ -522,7 +522,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
CraftingManager manager = getHandle().world.getMinecraftServer().getCraftingManager();
for (NamespacedKey recipeKey : recipeKeys) {
Optional<? extends IRecipe<?>> recipe = manager.a(CraftNamespacedKey.toMinecraft(recipeKey));
Optional<? extends IRecipe<?>> recipe = manager.getRecipe(CraftNamespacedKey.toMinecraft(recipeKey));
if (!recipe.isPresent()) {
continue;
}

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

@@ -140,12 +140,12 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
@Override
public boolean isFixed() {
return getHandle().ao;
return getHandle().fixed;
}
@Override
public void setFixed(boolean fixed) {
getHandle().ao = fixed;
getHandle().fixed = fixed;
}
@Override

10
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPig.java
View File

@@ -25,7 +25,7 @@ public class CraftPig extends CraftAnimals implements Pig {
@Override
public int getBoostTicks() {
return getHandle().saddleStorage.a ? getHandle().saddleStorage.c : 0;
return getHandle().saddleStorage.boosting ? getHandle().saddleStorage.boostTicks : 0;
}
@Override
@@ -37,19 +37,19 @@ public class CraftPig extends CraftAnimals implements Pig {
@Override
public int getCurrentBoostTicks() {
return getHandle().saddleStorage.a ? getHandle().saddleStorage.b : 0;
return getHandle().saddleStorage.boosting ? getHandle().saddleStorage.currentBoostTicks : 0;
}
@Override
public void setCurrentBoostTicks(int ticks) {
if (!getHandle().saddleStorage.a) {
if (!getHandle().saddleStorage.boosting) {
return;
}
int max = getHandle().saddleStorage.c;
int max = getHandle().saddleStorage.boostTicks;
Preconditions.checkArgument(ticks >= 0 && ticks <= max, "boost ticks must not exceed 0 or %d (inclusive)", max);
this.getHandle().saddleStorage.b = ticks;
this.getHandle().saddleStorage.currentBoostTicks = ticks;
}
@Override

48
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglin.java
View File

@@ -1,66 +1,24 @@
package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.server.EntityPiglin;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Piglin;
public class CraftPiglin extends CraftMonster implements Piglin {
public class CraftPiglin extends CraftPiglinAbstract implements Piglin {
public CraftPiglin(CraftServer server, EntityPiglin entity) {
super(server, entity);
}
@Override
public boolean isImmuneToZombification() {
return getHandle().eT();
}
@Override
public void setImmuneToZombification(boolean flag) {
getHandle().t(flag);
}
@Override
public boolean isAbleToHunt() {
return getHandle().bC;
return getHandle().cannotHunt;
}
@Override
public void setIsAbleToHunt(boolean flag) {
getHandle().bC = flag;
}
@Override
public int getConversionTime() {
Preconditions.checkState(isConverting(), "Entity not converting");
return getHandle().bA;
}
@Override
public void setConversionTime(int time) {
if (time < 0) {
getHandle().bA = -1;
getHandle().t(false);
} else {
getHandle().bA = time;
}
}
@Override
public boolean isConverting() {
return getHandle().eO(); // PAIL rename isConverting()
}
@Override
public boolean isBaby() {
return getHandle().isBaby();
}
@Override
public void setBaby(boolean flag) {
getHandle().a(flag);
getHandle().cannotHunt = flag;
}
@Override

59
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinAbstract.java Normal file
View File

@@ -0,0 +1,59 @@
package org.bukkit.craftbukkit.entity;
import com.google.common.base.Preconditions;
import net.minecraft.server.EntityPiglinAbstract;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.PiglinAbstract;
public class CraftPiglinAbstract extends CraftMonster implements PiglinAbstract {
public CraftPiglinAbstract(CraftServer server, EntityPiglinAbstract entity) {
super(server, entity);
}
@Override
public boolean isImmuneToZombification() {
return getHandle().isImmuneToZombification();
}
@Override
public void setImmuneToZombification(boolean flag) {
getHandle().setImmuneToZombification(flag);
}
@Override
public int getConversionTime() {
Preconditions.checkState(isConverting(), "Entity not converting");
return getHandle().conversionTicks;
}
@Override
public void setConversionTime(int time) {
if (time < 0) {
getHandle().conversionTicks = -1;
getHandle().setImmuneToZombification(false);
} else {
getHandle().conversionTicks = time;
}
}
@Override
public boolean isConverting() {
return getHandle().isConverting();
}
@Override
public boolean isBaby() {
return getHandle().isBaby();
}
@Override
public void setBaby(boolean flag) {
getHandle().setBaby(flag);
}
@Override
public EntityPiglinAbstract getHandle() {
return (EntityPiglinAbstract) super.getHandle();
}
}

28
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPiglinBrute.java Normal file
View File

@@ -0,0 +1,28 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityPiglinBrute;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.PiglinBrute;
public class CraftPiglinBrute extends CraftPiglinAbstract implements PiglinBrute {
public CraftPiglinBrute(CraftServer server, EntityPiglinBrute entity) {
super(server, entity);
}
@Override
public EntityPiglinBrute getHandle() {
return (EntityPiglinBrute) super.getHandle();
}
@Override
public EntityType getType() {
return EntityType.PIGLIN_BRUTE;
}
@Override
public String toString() {
return "CraftPiglinBrute";
}
}

12
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -314,7 +314,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (getHandle().playerConnection == null) return;
// Do not directly assign here, from the packethandler we'll assign it.
getHandle().playerConnection.sendPacket(new PacketPlayOutSpawnPosition(new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())));
getHandle().playerConnection.sendPacket(new PacketPlayOutSpawnPosition(new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()), loc.getYaw()));
}
@Override
@@ -728,7 +728,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
BlockPosition bed = getHandle().getSpawn();
if (world != null && bed != null) {
Optional<Vec3D> spawnLoc = EntityHuman.getBed(((CraftWorld) world).getHandle(), bed, getHandle().isSpawnForced(), true);
Optional<Vec3D> spawnLoc = EntityHuman.getBed(((CraftWorld) world).getHandle(), bed, getHandle().getSpawnAngle(), getHandle().isSpawnForced(), true);
if (spawnLoc.isPresent()) {
Vec3D vec = spawnLoc.get();
return new Location(world, vec.x, vec.y, vec.z);
@@ -745,9 +745,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setBedSpawnLocation(Location location, boolean override) {
if (location == null) {
getHandle().setRespawnPosition(null, null, override, false);
getHandle().setRespawnPosition(null, null, location.getYaw(), override, false);
} else {
getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().getDimensionKey(), new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()), override, false);
getHandle().setRespawnPosition(((CraftWorld) location.getWorld()).getHandle().getDimensionKey(), new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()), location.getYaw(), override, false);
}
}
@@ -762,13 +762,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean hasDiscoveredRecipe(NamespacedKey recipe) {
Preconditions.checkArgument(recipe != null, "recipe cannot be null");
return getHandle().B().b(CraftNamespacedKey.toMinecraft(recipe));
return getHandle().getRecipeBook().hasDiscoveredRecipe(CraftNamespacedKey.toMinecraft(recipe));
}
@Override
public Set<NamespacedKey> getDiscoveredRecipes() {
ImmutableSet.Builder<NamespacedKey> bukkitRecipeKeys = ImmutableSet.builder();
getHandle().B().a.forEach(key -> bukkitRecipeKeys.add(CraftNamespacedKey.fromMinecraft(key)));
getHandle().getRecipeBook().recipes.forEach(key -> bukkitRecipeKeys.add(CraftNamespacedKey.fromMinecraft(key)));
return bukkitRecipeKeys.build();
}

18
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftStrider.java
View File

@@ -15,12 +15,12 @@ public class CraftStrider extends CraftAnimals implements Strider {
@Override
public boolean isShivering() {
return getHandle().eL(); // PAIL rename isShivering
return getHandle().isShivering();
}
@Override
public void setShivering(boolean shivering) {
this.getHandle().t(shivering); // PAIL rename setShivering
this.getHandle().setShivering(shivering);
}
@Override
@@ -30,36 +30,36 @@ public class CraftStrider extends CraftAnimals implements Strider {
@Override
public void setSaddle(boolean saddled) {
getHandle().bA.setSaddle(saddled);
getHandle().saddleStorage.setSaddle(saddled);
}
@Override
public int getBoostTicks() {
return getHandle().bA.a ? getHandle().bA.c : 0;
return getHandle().saddleStorage.boosting ? getHandle().saddleStorage.boostTicks : 0;
}
@Override
public void setBoostTicks(int ticks) {
Preconditions.checkArgument(ticks >= 0, "ticks must be >= 0");
getHandle().bA.setBoostTicks(ticks);
getHandle().saddleStorage.setBoostTicks(ticks);
}
@Override
public int getCurrentBoostTicks() {
return getHandle().bA.a ? getHandle().bA.b : 0;
return getHandle().saddleStorage.boosting ? getHandle().saddleStorage.currentBoostTicks : 0;
}
@Override
public void setCurrentBoostTicks(int ticks) {
if (!getHandle().bA.a) {
if (!getHandle().saddleStorage.boosting) {
return;
}
int max = getHandle().bA.c;
int max = getHandle().saddleStorage.boostTicks;
Preconditions.checkArgument(ticks >= 0 && ticks <= max, "boost ticks must not exceed 0 or %d (inclusive)", max);
this.getHandle().bA.b = ticks;
this.getHandle().saddleStorage.currentBoostTicks = ticks;
}
@Override

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

@@ -18,7 +18,7 @@ public class CraftZoglin extends CraftMonster implements Zoglin {
@Override
public void setBaby(boolean flag) {
getHandle().a(flag);
getHandle().setBaby(flag);
}
@Override