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

Update to Minecraft 1.12

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-06-08 18:00:00 +10:00
parent 7b45ff54ad
commit ea595a5dcf
32 changed files with 65 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/nms-patches/EntityHuman.patch
View File

@@ -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;