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

Update to mcdev rename revision 01 for 1.8.1

Browse Source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot
2011-09-24 22:03:31 +01:00
parent 004a7aca08
commit 86526921b7
9 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,7 +83,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
else if (entity instanceof EntityEgg) { return new CraftEgg(server, (EntityEgg) entity); }
else if (entity instanceof EntityFallingSand) { return new CraftFallingSand(server, (EntityFallingSand) entity); }
else if (entity instanceof EntityFireball) { return new CraftFireball(server, (EntityFireball) entity); }
else if (entity instanceof EntityFish) { return new CraftFish(server, (EntityFish) entity); }
else if (entity instanceof EntityFishingHook) { return new CraftFish(server, (EntityFishingHook) entity); }
else if (entity instanceof EntityItem) { return new CraftItem(server, (EntityItem) entity); }
else if (entity instanceof EntityWeather) {
if (entity instanceof EntityWeatherStorm) {

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

@@ -50,7 +50,7 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
}
public Vector getDirection() {
return new Vector(((EntityFireball) getHandle()).c, ((EntityFireball) getHandle()).d, ((EntityFireball) getHandle()).e);
return new Vector(((EntityFireball) getHandle()).dirX, ((EntityFireball) getHandle()).dirY, ((EntityFireball) getHandle()).dirZ);
}
public void setDirection(Vector direction) {

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

@@ -1,6 +1,6 @@
package org.bukkit.craftbukkit.entity;
import net.minecraft.server.EntityFish;
import net.minecraft.server.EntityFishingHook;
import net.minecraft.server.EntityHuman;
import org.bukkit.craftbukkit.CraftServer;
@@ -8,7 +8,7 @@ import org.bukkit.entity.Fish;
import org.bukkit.entity.LivingEntity;
public class CraftFish extends AbstractProjectile implements Fish {
public CraftFish(CraftServer server, EntityFish entity) {
public CraftFish(CraftServer server, EntityFishingHook entity) {
super(server, entity);
}
@@ -18,8 +18,8 @@ public class CraftFish extends AbstractProjectile implements Fish {
}
public LivingEntity getShooter() {
if (((EntityFish) getHandle()).owner != null) {
return (LivingEntity) ((EntityFish) getHandle()).owner.getBukkitEntity();
if (((EntityFishingHook) getHandle()).owner != null) {
return (LivingEntity) ((EntityFishingHook) getHandle()).owner.getBukkitEntity();
}
return null;
@@ -28,7 +28,7 @@ public class CraftFish extends AbstractProjectile implements Fish {
public void setShooter(LivingEntity shooter) {
if (shooter instanceof CraftHumanEntity) {
((EntityFish) getHandle()).owner = (EntityHuman) ((CraftHumanEntity) shooter).entity;
((EntityFishingHook) getHandle()).owner = (EntityHuman) ((CraftHumanEntity) shooter).entity;
}
}

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

@@ -47,9 +47,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (value == isOp()) return;
if (value) {
server.getHandle().e(getName());
server.getHandle().addOp(getName());
} else {
server.getHandle().f(getName());
server.getHandle().removeOp(getName());
}
perm.recalculatePermissions();
@@ -299,11 +299,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public boolean isSprinting() {
return getHandle().at();
return getHandle().isSprinting();
}
public void setSprinting(boolean sprinting) {
getHandle().g(sprinting);
getHandle().setSprinting(sprinting);
}
public void loadData() {
@@ -398,21 +398,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setBanned(boolean value) {
if (value) {
server.getHandle().a(getName().toLowerCase());
server.getHandle().addUserBan(getName().toLowerCase());
} else {
server.getHandle().b(getName().toLowerCase());
server.getHandle().removeUserBan(getName().toLowerCase());
}
}
public boolean isWhitelisted() {
return server.getHandle().e().contains(getName().toLowerCase());
return server.getHandle().getWhitelisted().contains(getName().toLowerCase());
}
public void setWhitelisted(boolean value) {
if (value) {
server.getHandle().k(getName().toLowerCase());
server.getHandle().addWhitelist(getName().toLowerCase());
} else {
server.getHandle().l(getName().toLowerCase());
server.getHandle().removeWhitelist(getName().toLowerCase());
}
}