twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 12:42:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.12-pre2

Browse Source
This commit is contained in:
md_5
2017-05-14 12:00:00 +10:00
parent 6e3cec8bc7
commit 5195487ec6
210 changed files with 2280 additions and 1974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nms-patches/EntityBoat.patch
View File

@@ -48,13 +48,13 @@
+ // f = event.getDamage(); // TODO Why don't we do this?
+ // CraftBukkit end
+
this.d(-this.q());
this.b(10);
this.setDamage(this.n() + f * 10.0F);
this.d(-this.r());
this.c(10);
this.setDamage(this.p() + f * 10.0F);
@@ -102,6 +132,15 @@
boolean flag = damagesource.getEntity() instanceof EntityHuman && ((EntityHuman) damagesource.getEntity()).abilities.canInstantlyBuild;
if (flag || this.n() > 40.0F) {
if (flag || this.p() > 40.0F) {
+ // CraftBukkit start
+ VehicleDestroyEvent destroyEvent = new VehicleDestroyEvent(vehicle, attacker);
+ this.world.getServer().getPluginManager().callEvent(destroyEvent);
@@ -98,12 +98,12 @@
}
+ private Location lastLocation; // CraftBukkit
public void A_() {
public void B_() {
this.aH = this.aG;
this.aG = this.t();
this.aG = this.u();
@@ -178,7 +234,6 @@
if (this.n() > 0.0F) {
this.setDamage(this.n() - 1.0F);
if (this.p() > 0.0F) {
this.setDamage(this.p() - 1.0F);
}
-
this.lastX = this.locX;
@@ -131,8 +131,8 @@
+
for (int i = 0; i <= 1; ++i) {
if (this.a(i)) {
this.f[i] = (float) ((double) this.f[i] + 0.01D);
@@ -593,6 +664,11 @@
if (!this.isSilent() && (double) (this.f[i] % 6.2831855F) <= 0.7853981852531433D && ((double) this.f[i] + 0.39269909262657166D) % 6.2831854820251465D >= 0.7853981852531433D) {
@@ -622,6 +693,11 @@
this.e(this.fallDistance, 1.0F);
if (!this.world.isClientSide && !this.dead) {
@@ -144,7 +144,7 @@
this.die();
if (this.world.getGameRules().getBoolean("doEntityDrops")) {
int i;
@@ -606,6 +682,7 @@
@@ -635,6 +711,7 @@
}
}
}