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

Update to Minecraft 1.10

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2016-06-09 11:43:49 +10:00
parent 604d9373c0
commit a39b7e5f3a
161 changed files with 1176 additions and 1147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
View File

@@ -149,17 +149,6 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
getHandle().setBasePlate(!basePlate);
}
@Override
public boolean hasGravity() {
return !getHandle().hasGravity();
}
@Override
public void setGravity(boolean gravity) {
getHandle().setGravity(!gravity);
getHandle().noclip = !gravity;
}
@Override
public boolean isVisible() {
return !getHandle().isInvisible();

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

@@ -67,6 +67,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
else if (entity instanceof EntitySheep) { return new CraftSheep(server, (EntitySheep) entity); }
else if (entity instanceof EntityHorse) { return new CraftHorse(server, (EntityHorse) entity); }
else if (entity instanceof EntityRabbit) { return new CraftRabbit(server, (EntityRabbit) entity); }
else if (entity instanceof EntityPolarBear) { return new CraftPolarBear(server, (EntityPolarBear) entity); }
else { return new CraftAnimals(server, (EntityAnimal) entity); }
}
// Monsters
@@ -564,14 +565,24 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
@Override
public boolean isSilent() {
return getHandle().ad(); // PAIL: Rename isSilent
}
public boolean isSilent() {
return getHandle().isSilent();
}
@Override
public void setSilent(boolean flag) {
getHandle().c(flag); // PAIL: Rename setSilent
}
@Override
public void setSilent(boolean flag) {
getHandle().setSilent(flag);
}
@Override
public boolean hasGravity() {
return !getHandle().isNoGravity();
}
@Override
public void setGravity(boolean gravity) {
getHandle().setNoGravity(!gravity);
}
private static PermissibleBase getPermissibleBase() {
if (perm == null) {

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

@@ -363,7 +363,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
IChatBaseComponent[] components = CraftSign.sanitizeLines(lines);
TileEntitySign sign = new TileEntitySign();
sign.a(new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); // PAIL: rename
sign.setPosition(new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
System.arraycopy(components, 0, sign.lines, 0, sign.lines.length);
getHandle().playerConnection.sendPacket(sign.getUpdatePacket());
@@ -756,7 +756,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
getHandle().setSpectatorTarget(getHandle());
getHandle().playerInteractManager.setGameMode(WorldSettings.EnumGamemode.getById(mode.getValue()));
getHandle().playerInteractManager.setGameMode(EnumGamemode.getById(mode.getValue()));
getHandle().fallDistance = 0;
getHandle().playerConnection.sendPacket(new PacketPlayOutGameStateChange(3, mode.getValue()));
}

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

@@ -0,0 +1,27 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityPolarBear;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.PolarBear;
public class CraftPolarBear extends CraftAnimals implements PolarBear {
public CraftPolarBear(CraftServer server, EntityPolarBear entity) {
super(server, entity);
}
@Override
public EntityPolarBear getHandle() {
return (EntityPolarBear) entity;
}
@Override
public String toString() {
return "CraftPolarBear";
}
@Override
public EntityType getType() {
return EntityType.POLAR_BEAR;
}
}

5
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
View File

@@ -1,6 +1,7 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntitySkeleton;
import net.minecraft.server.EnumSkeletonType;
import org.apache.commons.lang.Validate;
import org.bukkit.craftbukkit.CraftServer;
@@ -28,11 +29,11 @@ public class CraftSkeleton extends CraftMonster implements Skeleton {
}
public SkeletonType getSkeletonType() {
return SkeletonType.getType(getHandle().getSkeletonType());
return SkeletonType.values()[getHandle().getSkeletonType().ordinal()];
}
public void setSkeletonType(SkeletonType type) {
Validate.notNull(type);
getHandle().setSkeletonType(type.getId());
getHandle().setSkeletonType(EnumSkeletonType.a(type.ordinal())); // PAIL: rename
}
}

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

@@ -12,12 +12,12 @@ public class CraftSnowman extends CraftGolem implements Snowman {
@Override
public boolean isDerp() {
return getHandle().o(); // PAIL: Rename
return getHandle().isDerp();
}
@Override
public void setDerp(boolean derpMode) {
getHandle().a(derpMode); // PAIL: Rename
getHandle().setDerp(derpMode);
}
@Override

20
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftTippedArrow.java
View File

@@ -43,7 +43,7 @@ public class CraftTippedArrow extends CraftArrow implements TippedArrow {
public boolean addCustomEffect(PotionEffect effect, boolean override) {
int effectId = effect.getType().getId();
MobEffect existing = null;
for (MobEffect mobEffect : getHandle().h) {
for (MobEffect mobEffect : getHandle().effects) {
if (MobEffectList.getId(mobEffect.getMobEffect()) == effectId) {
existing = mobEffect;
}
@@ -52,7 +52,7 @@ public class CraftTippedArrow extends CraftArrow implements TippedArrow {
if (!override) {
return false;
}
getHandle().h.remove(existing);
getHandle().effects.remove(existing);
}
getHandle().a(CraftPotionUtil.fromBukkit(effect));
getHandle().refreshEffects();
@@ -62,14 +62,14 @@ public class CraftTippedArrow extends CraftArrow implements TippedArrow {
@Override
public void clearCustomEffects() {
Validate.isTrue(getBasePotionData().getType() != PotionType.UNCRAFTABLE, "Tipped Arrows must have at least 1 effect");
getHandle().h.clear();
getHandle().effects.clear();
getHandle().refreshEffects();
}
@Override
public List<PotionEffect> getCustomEffects() {
ImmutableList.Builder<PotionEffect> builder = ImmutableList.builder();
for (MobEffect effect : getHandle().h) {
for (MobEffect effect : getHandle().effects) {
builder.add(CraftPotionUtil.toBukkit(effect));
}
return builder.build();
@@ -77,7 +77,7 @@ public class CraftTippedArrow extends CraftArrow implements TippedArrow {
@Override
public boolean hasCustomEffect(PotionEffectType type) {
for (MobEffect effect : getHandle().h) {
for (MobEffect effect : getHandle().effects) {
if (CraftPotionUtil.equals(effect.getMobEffect(), type)) {
return true;
}
@@ -87,14 +87,14 @@ public class CraftTippedArrow extends CraftArrow implements TippedArrow {
@Override
public boolean hasCustomEffects() {
return !getHandle().h.isEmpty();
return !getHandle().effects.isEmpty();
}
@Override
public boolean removeCustomEffect(PotionEffectType effect) {
int effectId = effect.getId();
MobEffect existing = null;
for (MobEffect mobEffect : getHandle().h) {
for (MobEffect mobEffect : getHandle().effects) {
if (MobEffectList.getId(mobEffect.getMobEffect()) == effectId) {
existing = mobEffect;
}
@@ -102,8 +102,8 @@ public class CraftTippedArrow extends CraftArrow implements TippedArrow {
if (existing == null) {
return false;
}
Validate.isTrue(getBasePotionData().getType() != PotionType.UNCRAFTABLE || getHandle().h.size() != 1, "Tipped Arrows must have at least 1 effect");
getHandle().h.remove(existing);
Validate.isTrue(getBasePotionData().getType() != PotionType.UNCRAFTABLE || !getHandle().effects.isEmpty(), "Tipped Arrows must have at least 1 effect");
getHandle().effects.remove(existing);
getHandle().refreshEffects();
return true;
}
@@ -111,7 +111,7 @@ public class CraftTippedArrow extends CraftArrow implements TippedArrow {
@Override
public void setBasePotionData(PotionData data) {
Validate.notNull(data, "PotionData cannot be null");
Validate.isTrue(data.getType() != PotionType.UNCRAFTABLE || !getHandle().h.isEmpty(), "Tipped Arrows must have at least 1 effect");
Validate.isTrue(data.getType() != PotionType.UNCRAFTABLE || !getHandle().effects.isEmpty(), "Tipped Arrows must have at least 1 effect");
getHandle().setType(CraftPotionUtil.fromBukkit(data));
}

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

@@ -39,12 +39,12 @@ public class CraftVillager extends CraftAgeable implements Villager, InventoryHo
}
public Profession getProfession() {
return Profession.getProfession(getHandle().getProfession());
return Profession.values()[getHandle().getProfession()];
}
public void setProfession(Profession profession) {
Validate.notNull(profession);
getHandle().setProfession(profession.getId());
getHandle().setProfession(profession.ordinal());
}
@Override

17
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
View File

@@ -1,6 +1,7 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityZombie;
import net.minecraft.server.EnumZombieType;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.EntityType;
@@ -40,25 +41,17 @@ public class CraftZombie extends CraftMonster implements Zombie {
}
public void setVillager(boolean flag) {
if (flag) {
getHandle().setVillagerType(0);
} else {
getHandle().clearVillagerType();
}
getHandle().setVillagerType(flag ? EnumZombieType.NORMAL : EnumZombieType.VILLAGER_FARMER);
}
@Override
public void setVillagerProfession(Villager.Profession profession) {
if (profession == null) {
getHandle().clearVillagerType();
} else {
getHandle().setVillagerType(profession.getId());
}
getHandle().setVillagerType(profession == null ? EnumZombieType.NORMAL : EnumZombieType.a(profession.ordinal()));
}
@Override
public Villager.Profession getVillagerProfession() {
if (!isVillager()) return null;
return Villager.Profession.getProfession(getHandle().getVillagerType());
if (!isVillager()) return Villager.Profession.NORMAL;
return Villager.Profession.values()[getHandle().getVillagerType().ordinal()];
}
}