Skip to content

Commit e4e3918

Browse files
committed
Inject player for player_death event
1 parent 9f191fa commit e4e3918

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

src/main/java/com/laytonsmith/core/events/drivers/PlayerEvents.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,24 @@ public boolean modifyEvent(String key, Mixed value, BindableEvent event) {
13951395
return false;
13961396
}
13971397
}
1398+
1399+
@Override
1400+
public void preExecution(Environment env, ActiveEvent activeEvent) {
1401+
if(activeEvent.getUnderlyingEvent() instanceof MCPlayerEvent) {
1402+
1403+
// Static lookups of the player might not work here, but the player is passed in with the event.
1404+
MCPlayer player = ((MCPlayerEvent) activeEvent.getUnderlyingEvent()).getPlayer();
1405+
Static.InjectPlayer(player);
1406+
}
1407+
}
1408+
1409+
@Override
1410+
public void postExecution(Environment env, ActiveEvent activeEvent) {
1411+
if(activeEvent.getUnderlyingEvent() instanceof MCPlayerEvent) {
1412+
MCPlayer player = ((MCPlayerEvent) activeEvent.getUnderlyingEvent()).getPlayer();
1413+
Static.UninjectPlayer(player);
1414+
}
1415+
}
13981416
}
13991417

14001418
@api

0 commit comments

Comments
 (0)