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

Update to Minecraft 1.8

Browse Source 
For more information please see http://www.spigotmc.org/

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2014-11-26 08:32:16 +11:00
parent 2f44d66966
commit a419776f3c
347 changed files with 22151 additions and 1209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
paper-server/nms-patches/EntitySquid.patch Normal file
View File

@@ -0,0 +1,37 @@
--- ../work/decompile-bb26c12b/net/minecraft/server/EntitySquid.java 2014-11-27 08:59:46.733421706 +1100
+++ src/main/java/net/minecraft/server/EntitySquid.java 2014-11-27 08:42:10.156850903 +1100
@@ -1,5 +1,7 @@
package net.minecraft.server;
+import org.bukkit.craftbukkit.TrigMath; // CraftBukkit
+
public class EntitySquid extends EntityWaterAnimal {
public float a;
@@ -67,9 +69,11 @@
}
+ /* CraftBukkit start - Delegate to Entity to use existing inWater value
public boolean V() {
return this.world.a(this.getBoundingBox().grow(0.0D, -0.6000000238418579D, 0.0D), Material.WATER, (Entity) this);
}
+ // CraftBukkit end */
public void m() {
super.m();
@@ -116,10 +120,12 @@
}
f = MathHelper.sqrt(this.motX * this.motX + this.motZ * this.motZ);
- this.aG += (-((float) Math.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F - this.aG) * 0.1F;
+ // CraftBukkit - Math -> TrigMath
+ this.aG += (-((float) TrigMath.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F - this.aG) * 0.1F;
this.yaw = this.aG;
this.c = (float) ((double) this.c + 3.141592653589793D * (double) this.bp * 1.5D);
- this.a += (-((float) Math.atan2((double) f, this.motY)) * 180.0F / 3.1415927F - this.a) * 0.1F;
+ // CraftBukkit - Math -> TrigMath
+ this.a += (-((float) TrigMath.atan2((double) f, this.motY)) * 180.0F / 3.1415927F - this.a) * 0.1F;
} else {
this.bl = MathHelper.e(MathHelper.sin(this.bj)) * 3.1415927F * 0.25F;
if (!this.world.isStatic) {