[JSMOD@2_474_COMMIT] some player events

Author: magiclu550

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerItemEvent.java

@@ -12,6 +12,7 @@
 import cn.jsmod2.api.item.Item;
 import cn.jsmod2.api.item.ItemType;
 import cn.jsmod2.api.player.Player;
+import cn.jsmod2.network.PacketSender;
 
 public abstract class PlayerItemEvent extends PlayerEvent {
     private IItem item = new Item();
@@ -36,23 +37,27 @@ public IItem getItem() {
     }
 
     public void setItem(IItem item) {
-
+        PacketSender.sendEventSetPacket(playerName,"Item",item);
         this.item = item;
     }
 
     public ItemType getChangeTo() {
+        changeTo = PacketSender.sendEventGetPacket(playerName,"ChangeTo",ItemType.class);
         return changeTo;
     }
 
     public void setChangeTo(ItemType changeTo) {
+        PacketSender.sendEventSetPacket(playerName,"ChangeTo",changeTo);
         this.changeTo = changeTo;
     }
 
     public boolean isAllow() {
+        allow = PacketSender.sendEventGetPacket(playerName,"Allow",Boolean.class);
         return allow;
     }
 
     public void setAllow(boolean allow) {
+        PacketSender.sendEventSetPacket(playerName,"Allow",allow);
         this.allow = allow;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerLureEvent.java

@@ -9,6 +9,7 @@
 package cn.jsmod2.api.event.player;
 
 import cn.jsmod2.api.player.Player;
+import cn.jsmod2.network.PacketSender;
 
 /**
  * @author kevinj
@@ -27,10 +28,12 @@ public PlayerLureEvent(){
     }
 
     public boolean isAllowContain() {
+        allowContain = PacketSender.sendEventGetPacket(playerName,"AllowContain",Boolean.class);
         return allowContain;
     }
 
     public void setAllowContain(boolean allowContain) {
+        PacketSender.sendEventSetPacket(playerName,"AllowContain",allowContain);
         this.allowContain = allowContain;
     }
 }

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerMedkitUseEvent.java

@@ -9,6 +9,7 @@
 package cn.jsmod2.api.event.player;
 
 import cn.jsmod2.api.player.Player;
+import cn.jsmod2.network.PacketSender;
 
 /**
  * @author kevinj
@@ -27,10 +28,12 @@ public PlayerMedkitUseEvent(){
     }
 
     public Integer getRecoverHealth() {
+        recoverHealth = PacketSender.sendEventGetPacket(playerName,"RecoverHealth",Integer.class);
         return recoverHealth;
     }
 
     public void setRecoverHealth(Integer recoverHealth) {
+        PacketSender.sendEventSetPacket(playerName,"RecoverHealth",recoverHealth);
         this.recoverHealth = recoverHealth;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerPocketDimensionEnterEvent.java

@@ -9,8 +9,8 @@
 package cn.jsmod2.api.event.player;
 
 import cn.jsmod2.api.player.Player;
-import cn.jsmod2.core.annotations.UseForServerInit;
 import cn.jsmod2.core.math.Vector;
+import cn.jsmod2.network.PacketSender;
 
 /**
  * @author kevinj
@@ -20,40 +20,45 @@ public class PlayerPocketDimensionEnterEvent extends PlayerEvent implements IPla
 
     private Vector lastPosition;
 
-    private Vector targerPosision;
+    private Vector targetPosition;
 
     private Player attacker = new Player("");
 
     public void setDamage(float damage) {
+        PacketSender.sendEventSetPacket(playerName,"Damage",damage);
         this.damage = damage;
     }
 
-    public void setTargerPosision(Vector targerPosision) {
-        this.targerPosision = targerPosision;
+    public void setTargetPosition(Vector targetPosition) {
+        PacketSender.sendEventSetPacket(playerName,"TargetPosition",targetPosition);
+        this.targetPosition = targetPosition;
     }
 
     public float getDamage() {
+        damage = PacketSender.sendEventGetPacket(playerName,"Damage",Float.class);
         return damage;
     }
 
     public Vector getLastPosition() {
+        lastPosition = PacketSender.sendEventGetPacket(playerName,"LastPosition",Vector.class);
         return lastPosition;
     }
 
-    public Vector getTargerPosision() {
-        return targerPosision;
+    public Vector getTargetPosition() {
+        targetPosition = PacketSender.sendEventGetPacket(playerName,"TargetPosition",Vector.class);
+        return targetPosition;
     }
 
     public Player getAttacker() {
         return attacker;
     }
 
 
-    public PlayerPocketDimensionEnterEvent(Player player, float damage, Vector lastPosition, Vector targerPosision, Player attacker) {
+    public PlayerPocketDimensionEnterEvent(Player player, float damage, Vector lastPosition, Vector targetPosition, Player attacker) {
         super(player);
         this.damage = damage;
         this.lastPosition = lastPosition;
-        this.targerPosision = targerPosision;
+        this.targetPosition = targetPosition;
         this.attacker = attacker;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerPocketDimensionExitEvent.java

@@ -9,8 +9,10 @@
 package cn.jsmod2.api.event.player;
 
 import cn.jsmod2.api.player.Player;
+import cn.jsmod2.core.math.Vector;
+import cn.jsmod2.network.PacketSender;
+
 
-import java.util.Vector;
 
 /**
  * @author kevinj
@@ -28,10 +30,12 @@ public PlayerPocketDimensionExitEvent(){
     }
 
     public Vector getExitPosition() {
+        exitPosition = PacketSender.sendEventGetPacket(playerName,"ExitPosition", Vector.class);
         return exitPosition;
     }
 
     public void setExitPosition(Vector exitPosition) {
+        PacketSender.sendEventSetPacket(playerName,"ExitPosition",exitPosition);
         this.exitPosition = exitPosition;
     }
 }

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerRadioSwitchEvent.java

@@ -10,6 +10,7 @@
 
 import cn.jsmod2.api.player.Player;
 import cn.jsmod2.api.player.RadioStatus;
+import cn.jsmod2.network.PacketSender;
 
 /**
  * @author kevinj
@@ -18,10 +19,12 @@ public class PlayerRadioSwitchEvent extends PlayerEvent implements IPlayerRadioS
     private RadioStatus ChangeTo;
 
     public RadioStatus getChangeTo() {
+        ChangeTo = PacketSender.sendEventGetPacket(playerName,"ChangeTo",RadioStatus.class);
         return ChangeTo;
     }
 
     public void setChangeTo(RadioStatus changeTo) {
+        PacketSender.sendEventSetPacket(playerName,"ChangeTo",changeTo);
         ChangeTo = changeTo;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerRecallZombieEvent.java

@@ -10,6 +10,7 @@
 
 import cn.jsmod2.api.player.Player;
 import cn.jsmod2.core.annotations.UseForServerInit;
+import cn.jsmod2.network.PacketSender;
 
 /**
  * @author kevinj
@@ -30,10 +31,12 @@ public PlayerRecallZombieEvent(){
     }
 
     public boolean isAllowRecall() {
+        allowRecall = PacketSender.sendEventGetPacket(playerName,"AllowRecall",Boolean.class);
         return allowRecall;
     }
 
     public void setAllowRecall(boolean allowRecall) {
+        PacketSender.sendEventSetPacket(playerName,"AllowRecall",allowRecall);
         this.allowRecall = allowRecall;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerReloadEvent.java

@@ -11,6 +11,7 @@
 import cn.jsmod2.api.item.ItemType;
 import cn.jsmod2.api.player.Player;
 import cn.jsmod2.core.annotations.UseForServerInit;
+import cn.jsmod2.network.PacketSender;
 
 /**
  * @author kevinj
@@ -39,34 +40,42 @@ public PlayerReloadEvent(){
     }
 
     public int getAmmoRemoved() {
+        ammoRemoved = PacketSender.sendEventGetPacket(playerName,"AmmoRemoved",Integer.class);
         return ammoRemoved;
     }
 
     public void setAmmoRemoved(int ammoRemoved) {
+        PacketSender.sendEventSetPacket(playerName,"AmmoRemoved",ammoRemoved);
         this.ammoRemoved = ammoRemoved;
     }
 
     public int getClipAmmoCountAfterReload() {
+        ClipAmmoCountAfterReload = PacketSender.sendEventGetPacket(playerName,"ClipAmmoCountAfterReload",Integer.class);
         return ClipAmmoCountAfterReload;
     }
 
     public void setClipAmmoCountAfterReload(int clipAmmoCountAfterReload) {
+        PacketSender.sendEventSetPacket(playerName,"ClipAmmoCountAfterReload",clipAmmoCountAfterReload);
         ClipAmmoCountAfterReload = clipAmmoCountAfterReload;
     }
 
     public ItemType getWeapon() {
+        weapon = PacketSender.sendEventGetPacket(playerName,"Weapon",ItemType.class);
         return weapon;
     }
 
     public int getNormalMaxClipSize() {
+        NormalMaxClipSize = PacketSender.sendEventGetPacket(playerName,"NormalMaxClipSize",Integer.class);
         return NormalMaxClipSize;
     }
 
     public int getCurrentClipAmmoCount() {
+        CurrentClipAmmoCount = PacketSender.sendEventGetPacket(playerName,"CurrentClipAmmoCount",Integer.class);
         return CurrentClipAmmoCount;
     }
 
     public int getCurrentAmmoTotal() {
+        CurrentAmmoTotal = PacketSender.sendEventGetPacket(playerName,"CurrentAmmoTotal",Integer.class);
         return CurrentAmmoTotal;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerSCP914ChangeKnobEvent.java

@@ -11,6 +11,7 @@
 
 import cn.jsmod2.api.item.KnobSetting;
 import cn.jsmod2.api.player.Player;
+import cn.jsmod2.network.PacketSender;
 
 /**
  * @author kevinj
@@ -19,10 +20,12 @@ public class PlayerSCP914ChangeKnobEvent extends PlayerEvent implements IPlayerS
     private KnobSetting knobSetting;
 
     public KnobSetting getKnobSetting() {
+        knobSetting = PacketSender.sendEventGetPacket(playerName,"KnobSetting",KnobSetting.class);
         return knobSetting;
     }
 
     public void setKnobSetting(KnobSetting knobSetting) {
+        PacketSender.sendEventSetPacket(playerName,"KnobSetting",knobSetting);
         this.knobSetting = knobSetting;
     }
 

JSMod2API/src/main/java/cn/jsmod2/api/event/player/PlayerSetRoleEvent.java

@@ -12,6 +12,8 @@
 import cn.jsmod2.api.player.Player;
 import cn.jsmod2.api.team.Role;
 import cn.jsmod2.api.team.TeamRole;
+import cn.jsmod2.network.PacketSender;
+import cn.jsmod2.network.protocol.event.admin.PlayerSetRoleSetItemsPacket;
 
 import java.util.List;
 
@@ -26,14 +28,20 @@ public class PlayerSetRoleEvent extends PlayerEvent implements IPlayerSetRoleEve
     private TeamRole teamRole;
 
     public void setItems(List<ItemType> items) {
+        PlayerSetRoleSetItemsPacket packet = new PlayerSetRoleSetItemsPacket();
+        packet.playerName = playerName;
+        packet.items = items;
+        packet.send();
         this.items = items;
     }
 
     public void setUsingDefaultItem(boolean usingDefaultItem) {
+        PacketSender.sendEventSetPacket(playerName,"UsingDefaultItem",usingDefaultItem);
         this.usingDefaultItem = usingDefaultItem;
     }
 
     public void setRole(Role role) {
+        PacketSender.sendEventSetPacket(playerName,"Role",role);
         this.role = role;
     }