summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-09-21 15:22:48 -0300
committershennetsind <ind@henn.et>2014-09-21 15:22:48 -0300
commit145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9 (patch)
treeb743a4d405556a31fcf4dd3c21a68f35ceb55270
parent8703337d4a08798613eeedf8730631ede2399df6 (diff)
parent0773ec5e92dc7b44cc6f32f134d77d950c20d521 (diff)
downloadhercules-145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9.tar.gz
hercules-145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9.tar.bz2
hercules-145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9.tar.xz
hercules-145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9.zip
Merge branch 'master' of github.com:HerculesWS/Hercules
-rw-r--r--src/map/clif.c1
-rw-r--r--src/map/unit.c2
-rw-r--r--src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc4
-rw-r--r--src/plugins/HPMHooking/HPMHooking.HookingPoints.inc1
-rw-r--r--src/plugins/HPMHooking/HPMHooking.Hooks.inc26
5 files changed, 32 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 6838a8021..f6ab3f444 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -3432,7 +3432,6 @@ void clif_arrowequip(struct map_session_data *sd,int val)
nullpo_retv(sd);
- pc_stop_attack(sd); // [Valaris]
#if PACKETVER >= 20121128
clif->status_change(&sd->bl, SI_CLIENT_ONLY_EQUIP_ARROW, 1, INVALID_TIMER, 0, 0, 0);
#endif
diff --git a/src/map/unit.c b/src/map/unit.c
index 1f81e0d2f..36eed87fe 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -930,7 +930,7 @@ int unit_can_move(struct block_list *bl) {
|| sc->data[SC_ELECTRICSHOCKER]
|| sc->data[SC_WUGBITE]
|| sc->data[SC_THORNS_TRAP]
- || sc->data[SC_MAGNETICFIELD]
+ || ( sc->data[SC_MAGNETICFIELD] && !sc->data[SC_HOVERING] )
|| sc->data[SC__MANHOLE]
|| sc->data[SC_CURSEDCIRCLE_ATKER]
|| sc->data[SC_CURSEDCIRCLE_TARGET]
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index d73525b70..feb929dbc 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -977,6 +977,8 @@ struct {
struct HPMHookPoint *HP_clif_party_show_picker_post;
struct HPMHookPoint *HP_clif_partyinvitationstate_pre;
struct HPMHookPoint *HP_clif_partyinvitationstate_post;
+ struct HPMHookPoint *HP_clif_PartyLeaderChanged_pre;
+ struct HPMHookPoint *HP_clif_PartyLeaderChanged_post;
struct HPMHookPoint *HP_clif_guild_created_pre;
struct HPMHookPoint *HP_clif_guild_created_post;
struct HPMHookPoint *HP_clif_guild_belonginfo_pre;
@@ -6014,6 +6016,8 @@ struct {
int HP_clif_party_show_picker_post;
int HP_clif_partyinvitationstate_pre;
int HP_clif_partyinvitationstate_post;
+ int HP_clif_PartyLeaderChanged_pre;
+ int HP_clif_PartyLeaderChanged_post;
int HP_clif_guild_created_pre;
int HP_clif_guild_created_post;
int HP_clif_guild_belonginfo_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index 05d484d20..7c6e6305b 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -498,6 +498,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(clif->party_xy_remove, HP_clif_party_xy_remove) },
{ HP_POP(clif->party_show_picker, HP_clif_party_show_picker) },
{ HP_POP(clif->partyinvitationstate, HP_clif_partyinvitationstate) },
+ { HP_POP(clif->PartyLeaderChanged, HP_clif_PartyLeaderChanged) },
{ HP_POP(clif->guild_created, HP_clif_guild_created) },
{ HP_POP(clif->guild_belonginfo, HP_clif_guild_belonginfo) },
{ HP_POP(clif->guild_masterormember, HP_clif_guild_masterormember) },
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index 8f209fe5c..4cc8bbf18 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -12937,6 +12937,32 @@ void HP_clif_partyinvitationstate(struct map_session_data *sd) {
}
return;
}
+void HP_clif_PartyLeaderChanged(struct map_session_data *sd, int prev_leader_aid, int new_leader_aid) {
+ int hIndex = 0;
+ if( HPMHooks.count.HP_clif_PartyLeaderChanged_pre ) {
+ void (*preHookFunc) (struct map_session_data *sd, int *prev_leader_aid, int *new_leader_aid);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyLeaderChanged_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_clif_PartyLeaderChanged_pre[hIndex].func;
+ preHookFunc(sd, &prev_leader_aid, &new_leader_aid);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return;
+ }
+ }
+ {
+ HPMHooks.source.clif.PartyLeaderChanged(sd, prev_leader_aid, new_leader_aid);
+ }
+ if( HPMHooks.count.HP_clif_PartyLeaderChanged_post ) {
+ void (*postHookFunc) (struct map_session_data *sd, int *prev_leader_aid, int *new_leader_aid);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_PartyLeaderChanged_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_clif_PartyLeaderChanged_post[hIndex].func;
+ postHookFunc(sd, &prev_leader_aid, &new_leader_aid);
+ }
+ }
+ return;
+}
void HP_clif_guild_created(struct map_session_data *sd, int flag) {
int hIndex = 0;
if( HPMHooks.count.HP_clif_guild_created_pre ) {