48 lines
2.4 KiB
Diff
48 lines
2.4 KiB
Diff
|
From 2522a926e6cc670f4f10657ea5494b5ffe81eb37 Mon Sep 17 00:00:00 2001
|
||
|
|
From: libraryaddict <libraryaddict115@yahoo.co.nz>
|
||
|
|
Date: Tue, 12 Jan 2016 19:56:07 +1300
|
||
|
|
Subject: [PATCH] Sound and vehicle fixes
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
index 4f366da..fc9cce0 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -1628,11 +1628,13 @@ public abstract class Entity implements ICommandListener {
|
||
|
|
EntityDismountEvent exitEvent1 = null;
|
||
|
|
if (this.vehicle != null) {
|
||
|
|
if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle))
|
||
|
|
+ {
|
||
|
|
exitEvent = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
|
||
|
|
- pluginManager.callEvent(exitEvent);
|
||
|
|
+ pluginManager.callEvent(exitEvent);
|
||
|
|
|
||
|
|
- if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
|
||
|
|
- return;
|
||
|
|
+ if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
|
||
|
|
exitEvent1 = new EntityDismountEvent(this.vehicle.getBukkitEntity(), this.bukkitEntity);
|
||
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
||
|
|
index 0cc8f9b..dd07600 100644
|
||
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
||
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
|
||
|
|
@@ -14,9 +14,9 @@ public class CraftSound {
|
||
|
|
set(AMBIENCE_RAIN, "ambient.weather.rain");
|
||
|
|
set(AMBIENCE_THUNDER, "ambient.weather.thunder");
|
||
|
|
// Damage
|
||
|
|
- set(HURT_FLESH, "game.neutral.hurt");
|
||
|
|
- set(FALL_BIG, "game.neutral.hurt.fall.big");
|
||
|
|
- set(FALL_SMALL, "game.neutral.hurt.fall.small");
|
||
|
|
+ set(HURT_FLESH, "game.player.hurt");
|
||
|
|
+ set(FALL_BIG, "game.player.hurt.fall.big");
|
||
|
|
+ set(FALL_SMALL, "game.player.hurt.fall.small");
|
||
|
|
// Dig Sounds
|
||
|
|
set(DIG_WOOL, "dig.cloth");
|
||
|
|
set(DIG_GRASS, "dig.grass");
|
||
|
|
--
|
||
|
|
1.9.5.msysgit.0
|
||
|
|
|