mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-16 09:34:46 +00:00
Fixed player script enabled button not working right on servers. Added more player events and a getDimension() method to ScriptPlayer. Set player scripts to be off by default.
This commit is contained in:
1 parent
047552d9e5
commit
a9bce4a3e3
9 files changed
+178
-44
No files matched your search
@@ -34,6 +34,8 @@ import net.minecraftforge.common.ForgeHooks;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.EntityEvent;
|
||||
import net.minecraftforge.event.entity.EntityEvent.EntityConstructing;
|
||||
import net.minecraftforge.event.entity.EntityStruckByLightningEvent;
|
||||
import net.minecraftforge.event.entity.PlaySoundAtEntityEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingFallEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingHurtEvent;
|
||||
@@ -139,6 +141,14 @@ public class ScriptPlayerEventHandler {
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void invoke(PlayerEvent.PlayerChangedDimensionEvent event) {
|
||||
if(event.player.worldObj instanceof WorldServer) {
|
||||
PlayerDataScript handler = PlayerData.get(event.player).scriptData;
|
||||
EventHooks.onPlayerChangeDim(handler, event.fromDim, event.toDim);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void invoke(PlayerEvent.ItemPickupEvent event) {
|
||||
if(event.player.worldObj instanceof WorldServer) {
|
||||
@@ -166,6 +176,28 @@ public class ScriptPlayerEventHandler {
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void invoke(EntityStruckByLightningEvent event) {
|
||||
if(event.entity.worldObj instanceof WorldServer) {
|
||||
PlayerDataScript handler;
|
||||
if (event.entity instanceof EntityPlayer) {
|
||||
handler = PlayerData.get((EntityPlayer)event.entity).scriptData;
|
||||
EventHooks.onPlayerLightning(handler);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void invoke(PlaySoundAtEntityEvent event) {
|
||||
if(event.entity.worldObj instanceof WorldServer) {
|
||||
PlayerDataScript handler;
|
||||
if (event.entity instanceof EntityPlayer) {
|
||||
handler = PlayerData.get((EntityPlayer)event.entity).scriptData;
|
||||
EventHooks.onPlayerSound(handler,event.name,event.pitch,event.volume);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void invoke(LivingDeathEvent event) {
|
||||
if(event.entityLiving.worldObj instanceof WorldServer) {
|
||||
@@ -206,6 +238,14 @@ public class ScriptPlayerEventHandler {
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void invoke(PlayerEvent.PlayerRespawnEvent event) {
|
||||
if(event.player.worldObj instanceof WorldServer) {
|
||||
PlayerDataScript handler = PlayerData.get(event.player).scriptData;
|
||||
EventHooks.onPlayerRespawn(handler);
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void invoke(PlayerEvent.PlayerLoggedInEvent event) {
|
||||
if(event.player.worldObj instanceof WorldServer) {
|
||||
|
||||
Reference in new issue
Block a user