summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntityHuman.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-06-08 18:00:00 +1000
committermd_5 <git@md-5.net>2017-06-08 18:00:00 +1000
commitbb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772 (patch)
treea8e03741d518f6448cf4c5410b194a4396fede5e /nms-patches/EntityHuman.patch
parentfe3ca95c764848be56e872e3de57c66cb07d7515 (diff)
downloadcraftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.gz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.lz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.tar.xz
craftbukkit-bb4ae3b3b8a36a90a6ac29746c5b6cb1351fc772.zip
Update to Minecraft 1.12
Diffstat (limited to 'nms-patches/EntityHuman.patch')
-rw-r--r--nms-patches/EntityHuman.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/EntityHuman.patch b/nms-patches/EntityHuman.patch
index 24faf198..deaef2bb 100644
--- a/nms-patches/EntityHuman.patch
+++ b/nms-patches/EntityHuman.patch
@@ -63,7 +63,7 @@
if (this.foodData.c() && this.ticksLived % 10 == 0) {
@@ -334,7 +359,7 @@
- this.m((float) attributeinstance.getValue());
+ this.k((float) attributeinstance.getValue());
float f = MathHelper.sqrt(this.motX * this.motX + this.motZ * this.motZ);
- float f1 = (float) (Math.atan(-this.motY * 0.20000000298023224D) * 15.0D);
+ float f1 = (float) ( org.bukkit.craftbukkit.TrigMath.atan(-this.motY * 0.20000000298023224D) * 15.0D); // CraftBukkit
@@ -153,8 +153,8 @@
}
public boolean a(EntityHuman entityhuman) {
-- ScoreboardTeamBase scoreboardteambase = this.aW();
-- ScoreboardTeamBase scoreboardteambase1 = entityhuman.aW();
+- ScoreboardTeamBase scoreboardteambase = this.aY();
+- ScoreboardTeamBase scoreboardteambase1 = entityhuman.aY();
+ // CraftBukkit start - Change to check OTHER player's scoreboard team according to API
+ // To summarize this method's logic, it's "Can parameter hurt this"
+ org.bukkit.scoreboard.Team team;