OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-08 11:24:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update CraftBukkit to 1.6.4

Browse source 
By: feildmaster <admin@feildmaster.com>
This commit is contained in:
CraftBukkit/Spigot 2013-09-19 13:25:08 -05:00
parent 278aee6f0d
commit 46b65df5ae
10 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
paper-server/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.6.2-R1.1-SNAPSHOT</version> <version>1.6.4-R0.1-SNAPSHOT</version>
<name>CraftBukkit</name> <name>CraftBukkit</name>
<url>http://www.bukkit.org</url> <url>http://www.bukkit.org</url>
@ -12,8 +12,8 @@
<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>
<junit.version>4.11</junit.version> <junit.version>4.11</junit.version>
<minecraft.version>1.6.2_01</minecraft.version> <minecraft.version>1.6.4</minecraft.version>
<minecraft_version>1_6_R2</minecraft_version> <minecraft_version>1_6_R3</minecraft_version>
</properties> </properties>
<scm> <scm>

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
View file

@ -15,7 +15,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
} }
public float getYield() { public float getYield() {
return getHandle().yield; return getHandle().bukkitYield;
} }
public boolean isIncendiary() { public boolean isIncendiary() {
@ -27,7 +27,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
} }
public void setYield(float yield) { public void setYield(float yield) {
getHandle().yield = yield; getHandle().bukkitYield = yield;
} }
public LivingEntity getShooter() { public LivingEntity getShooter() {

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
View file

@ -49,7 +49,7 @@ public class CraftFish extends AbstractProjectile implements Fish {
EntityFishingHook hook = getHandle(); EntityFishingHook hook = getHandle();
if (this.biteChance == -1) { if (this.biteChance == -1) {
if (hook.world.F(MathHelper.floor(hook.locX), MathHelper.floor(hook.locY) + 1, MathHelper.floor(hook.locZ))) { if (hook.world.isRainingAt(MathHelper.floor(hook.locX), MathHelper.floor(hook.locY) + 1, MathHelper.floor(hook.locZ))) {
return 1/300.0; return 1/300.0;
} }
return 1/500.0; return 1/500.0;

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java
View file

@ -54,7 +54,7 @@ public class CraftHorse extends CraftAnimals implements Horse {
public void setCarryingChest(boolean chest) { public void setCarryingChest(boolean chest) {
if (chest == isCarryingChest()) return; if (chest == isCarryingChest()) return;
getHandle().setHasChest(chest); getHandle().setHasChest(chest);
getHandle().cH(); // Should be loadChest getHandle().loadChest();
} }
public int getDomestication() { public int getDomestication() {
@ -68,7 +68,7 @@ public class CraftHorse extends CraftAnimals implements Horse {
} }
public int getMaxDomestication() { public int getMaxDomestication() {
return getHandle().cq(); // Should be getMaxDomestication return getHandle().getMaxDomestication();
} }
public void setMaxDomestication(int value) { public void setMaxDomestication(int value) {

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftIronGolem.java
View file

@ -21,11 +21,11 @@ public class CraftIronGolem extends CraftGolem implements IronGolem {
} }
public boolean isPlayerCreated() { public boolean isPlayerCreated() {
return getHandle().bW(); return getHandle().isPlayerCreated();
} }
public void setPlayerCreated(boolean playerCreated) { public void setPlayerCreated(boolean playerCreated) {
getHandle().f(playerCreated); getHandle().setPlayerCreated(playerCreated);
} }
@Override @Override

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
View file

@ -20,16 +20,16 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
getHandle().getDataWatcher().a(2, 5); getHandle().getDataWatcher().a(2, 5);
getHandle().getDataWatcher().h(2); getHandle().getDataWatcher().h(2);
} else { } else {
getHandle().a(CraftItemStack.asNMSCopy(item)); getHandle().setItem(CraftItemStack.asNMSCopy(item));
} }
} }
public org.bukkit.inventory.ItemStack getItem() { public org.bukkit.inventory.ItemStack getItem() {
return CraftItemStack.asBukkitCopy(getHandle().h()); return CraftItemStack.asBukkitCopy(getHandle().getItem());
} }
public Rotation getRotation() { public Rotation getRotation() {
return toBukkitRotation(getHandle().i()); return toBukkitRotation(getHandle().getRotation());
} }
Rotation toBukkitRotation(int value) { Rotation toBukkitRotation(int value) {
@ -44,7 +44,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
case 3: case 3:
return Rotation.COUNTER_CLOCKWISE; return Rotation.COUNTER_CLOCKWISE;
default: default:
throw new AssertionError("Unknown rotation " + getHandle().i() + " for " + getHandle()); throw new AssertionError("Unknown rotation " + value + " for " + getHandle());
} }
} }

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLargeFireball.java
View file

@ -13,7 +13,7 @@ public class CraftLargeFireball extends CraftFireball implements LargeFireball {
@Override @Override
public void setYield(float yield) { public void setYield(float yield) {
super.setYield(yield); super.setYield(yield);
getHandle().e = (int) yield; getHandle().yield = (int) yield;
} }
@Override @Override

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

@ -410,21 +410,21 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (!(getHandle() instanceof EntityInsentient)) { if (!(getHandle() instanceof EntityInsentient)) {
return false; return false;
} }
return ((EntityInsentient) getHandle()).bI() != null; return ((EntityInsentient) getHandle()).getLeashHolder() != null;
} }
public Entity getLeashHolder() throws IllegalStateException { public Entity getLeashHolder() throws IllegalStateException {
if (!isLeashed()) { if (!isLeashed()) {
throw new IllegalStateException("Entity not leashed"); throw new IllegalStateException("Entity not leashed");
} }
return ((EntityInsentient) getHandle()).bI().getBukkitEntity(); return ((EntityInsentient) getHandle()).getLeashHolder().getBukkitEntity();
} }
private boolean unleash() { private boolean unleash() {
if (!isLeashed()) { if (!isLeashed()) {
return false; return false;
} }
((EntityInsentient) getHandle()).a(true, false); ((EntityInsentient) getHandle()).unleash(true, false);
return true; return true;
} }
@ -442,7 +442,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
} }
unleash(); unleash();
((EntityInsentient) getHandle()).b(((CraftEntity) holder).getHandle(), true); ((EntityInsentient) getHandle()).setLeashHolder(((CraftEntity) holder).getHandle(), true);
return true; return true;
} }

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

@ -1045,7 +1045,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
public void updateScaledHealth() { public void updateScaledHealth() {
AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().aW(); AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().aX();
Set set = attributemapserver.b(); Set set = attributemapserver.b();
injectScaledMaxHealth(set, true); injectScaledMaxHealth(set, true);
@ -1070,6 +1070,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
continue; continue;
} }
collection.add(new AttributeModifiable(getHandle().aW(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true))); collection.add(new AttributeModifiable(getHandle().aX(), (new AttributeRanged("generic.maxHealth", scaledHealth ? healthScale : getMaxHealth(), 0.0D, Float.MAX_VALUE)).a("Max Health").a(true)));
} }
} }

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftThrownPotion.java
View file

@ -29,7 +29,7 @@ public class CraftThrownPotion extends CraftProjectile implements ThrownPotion {
// We run this method once since it will set the item stack if there is none. // We run this method once since it will set the item stack if there is none.
getHandle().getPotionValue(); getHandle().getPotionValue();
return CraftItemStack.asBukkitCopy(getHandle().c); return CraftItemStack.asBukkitCopy(getHandle().item);
} }
public void setItem(ItemStack item) { public void setItem(ItemStack item) {
@ -39,7 +39,7 @@ public class CraftThrownPotion extends CraftProjectile implements ThrownPotion {
// The ItemStack must be a potion. // The ItemStack must be a potion.
Validate.isTrue(item.getType() == Material.POTION, "ItemStack must be a potion. This item stack was " + item.getType() + "."); Validate.isTrue(item.getType() == Material.POTION, "ItemStack must be a potion. This item stack was " + item.getType() + ".");
getHandle().c = CraftItemStack.asNMSCopy(item); getHandle().item = CraftItemStack.asNMSCopy(item);
} }
@Override @Override