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

Update to Minecraft 1.14.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-05-14 10:00:00 +10:00
parent 1825747f6d
commit 788fd7eedc
60 changed files with 322 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,11 +43,11 @@ public class CraftCat extends CraftTameableAnimal implements Cat {
@Override
public DyeColor getCollarColor() {
return DyeColor.getByWoolData((byte) getHandle().ei().getColorIndex());
return DyeColor.getByWoolData((byte) getHandle().getCollarColor().getColorIndex());
}
@Override
public void setCollarColor(DyeColor color) {
getHandle().a(EnumColor.fromColorIndex(color.getWoolData()));
getHandle().setCollarColor(EnumColor.fromColorIndex(color.getWoolData()));
}
}

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

@@ -66,13 +66,13 @@ import net.minecraft.server.EntityIllagerWizard;
import net.minecraft.server.EntityIronGolem;
import net.minecraft.server.EntityItem;
import net.minecraft.server.EntityItemFrame;
import net.minecraft.server.EntityLLamaTrader;
import net.minecraft.server.EntityLargeFireball;
import net.minecraft.server.EntityLeash;
import net.minecraft.server.EntityLightning;
import net.minecraft.server.EntityLiving;
import net.minecraft.server.EntityLlama;
import net.minecraft.server.EntityLlamaSpit;
import net.minecraft.server.EntityLlamaTrader;
import net.minecraft.server.EntityMagmaCube;
import net.minecraft.server.EntityMinecartAbstract;
import net.minecraft.server.EntityMinecartChest;
@@ -220,7 +220,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
if (entity instanceof EntityHorseChestedAbstract){
if (entity instanceof EntityHorseDonkey) { return new CraftDonkey(server, (EntityHorseDonkey) entity); }
else if (entity instanceof EntityHorseMule) { return new CraftMule(server, (EntityHorseMule) entity); }
else if (entity instanceof EntityLLamaTrader) { return new CraftTraderLlama(server, (EntityLLamaTrader) entity); }
else if (entity instanceof EntityLlamaTrader) { return new CraftTraderLlama(server, (EntityLlamaTrader) entity); }
else if (entity instanceof EntityLlama) { return new CraftLlama(server, (EntityLlama) entity); }
} else if (entity instanceof EntityHorse) { return new CraftHorse(server, (EntityHorse) entity); }
else if (entity instanceof EntityHorseSkeleton) { return new CraftSkeletonHorse(server, (EntityHorseSkeleton) entity); }
@@ -933,7 +933,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@Override
public Pose getPose() {
return Pose.values()[getHandle().Z().ordinal()];
return Pose.values()[getHandle().getPose().ordinal()];
}
public void storeBukkitValues(NBTTagCompound c) {

14
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFox.java
View File

@@ -29,38 +29,38 @@ public class CraftFox extends CraftAnimals implements Fox {
@Override
public Type getFoxType() {
return Type.values()[getHandle().dV().ordinal()];
return Type.values()[getHandle().getFoxType().ordinal()];
}
@Override
public void setFoxType(Type type) {
Preconditions.checkArgument(type != null, "type");
getHandle().a(EntityFox.Type.values()[type.ordinal()]);
getHandle().setFoxType(EntityFox.Type.values()[type.ordinal()]);
}
@Override
public boolean isCrouching() {
return getHandle().ef();
return getHandle().isCrouching();
}
@Override
public void setCrouching(boolean crouching) {
getHandle().t(crouching);
getHandle().setCrouching(crouching);
}
@Override
public boolean isSitting() {
return getHandle().dW();
return getHandle().isSitting();
}
@Override
public void setSitting(boolean sitting) {
getHandle().r(sitting);
getHandle().setSitting(sitting);
}
@Override
public void setSleeping(boolean sleeping) {
getHandle().x(sleeping);
getHandle().setSleeping(sleeping);
}
}

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

@@ -18,14 +18,14 @@ public class CraftMushroomCow extends CraftCow implements MushroomCow {
@Override
public Variant getVariant() {
return Variant.values()[getHandle().dV().ordinal()];
return Variant.values()[getHandle().getVariant().ordinal()];
}
@Override
public void setVariant(Variant variant) {
Preconditions.checkArgument(variant != null, "variant");
getHandle().a(EntityMushroomCow.Type.values()[variant.ordinal()]);
getHandle().setVariant(EntityMushroomCow.Type.values()[variant.ordinal()]);
}
@Override

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

@@ -1,19 +1,19 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityLLamaTrader;
import net.minecraft.server.EntityLlamaTrader;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.TraderLlama;
public class CraftTraderLlama extends CraftLlama implements TraderLlama {
public CraftTraderLlama(CraftServer server, EntityLLamaTrader entity) {
public CraftTraderLlama(CraftServer server, EntityLlamaTrader entity) {
super(server, entity);
}
@Override
public EntityLLamaTrader getHandle() {
return (EntityLLamaTrader) super.getHandle();
public EntityLlamaTrader getHandle() {
return (EntityLlamaTrader) super.getHandle();
}
@Override