|
156 | 156 | if (!fluidstate.isSource()) {
|
157 | 157 | return Boat.Status.UNDER_FLOWING_WATER;
|
158 | 158 | }
|
159 |
| -@@ -759,21 +_,27 @@ |
| 159 | +@@ -747,6 +_,9 @@ |
| 160 | + } |
| 161 | + } |
| 162 | + |
| 163 | ++ //Ketting start - mixin error |
| 164 | ++ org.bukkit.entity.Vehicle checkFallDamage$vehicle; |
| 165 | ++ org.bukkit.event.vehicle.VehicleDestroyEvent checkFallDamage$destroyEvent; |
| 166 | + protected void checkFallDamage(double p_38307_, boolean p_38308_, BlockState p_38309_, BlockPos p_38310_) { |
| 167 | + this.lastYd = this.getDeltaMovement().y; |
| 168 | + if (!this.isPassenger()) { |
| 169 | +@@ -759,21 +_,28 @@ |
160 | 170 |
|
161 | 171 | this.causeFallDamage(this.fallDistance, 1.0F, this.damageSources().fall());
|
162 | 172 | if (!this.level().isClientSide && !this.isRemoved()) {
|
|
166 | 176 | - this.spawnAtLocation(this.getVariant().getPlanks());
|
167 | 177 | - }
|
168 | 178 | + // CraftBukkit start
|
169 |
| -+ org.bukkit.entity.Vehicle vehicle = (org.bukkit.entity.Vehicle) this.getBukkitEntity(); |
170 |
| -+ org.bukkit.event.vehicle.VehicleDestroyEvent destroyEvent = new org.bukkit.event.vehicle.VehicleDestroyEvent(vehicle, null); |
171 |
| -+ this.level().getCraftServer().getPluginManager().callEvent(destroyEvent); |
172 |
| -+ if (!destroyEvent.isCancelled()) { |
| 179 | ++ checkFallDamage$vehicle = (org.bukkit.entity.Vehicle) this.getBukkitEntity(); |
| 180 | ++ checkFallDamage$destroyEvent = new org.bukkit.event.vehicle.VehicleDestroyEvent(checkFallDamage$vehicle, null); |
| 181 | ++ this.level().getCraftServer().getPluginManager().callEvent(checkFallDamage$destroyEvent); |
| 182 | ++ if (!checkFallDamage$destroyEvent.isCancelled()) { |
| 183 | ++ //Ketting end |
173 | 184 | + this.kill();
|
174 | 185 | + if (this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
|
175 | 186 | + for (int i = 0; i < 3; ++i) {
|
|
0 commit comments