File tree Expand file tree Collapse file tree
pvpmanager/src/main/java/me/chancesd/pvpmanager/integration/hook Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -29,7 +29,7 @@ public TABHook(final Hook hook) {
2929 throw new DependencyException ("Can't hook into TAB, update TAB to 4.0.0 or above" , hook );
3030 }
3131 this .showInPlayerlist = getConfigBoolean ("Show In Tab" , true );
32- this .showAboveHead =getConfigBoolean ("Show Above Player" , true );
32+ this .showAboveHead = getConfigBoolean ("Show Above Player" , true );
3333
3434 registerLoadEvent ();
3535 }
@@ -41,12 +41,14 @@ private void registerLoadEvent() {
4141 eventBus .register (PlayerLoadEvent .class , event -> {
4242 final TabPlayer tabPlayer = event .getPlayer ();
4343 if (event .isJoin ()) {
44- final CombatPlayer pvPlayer = CombatPlayer .get ((Player ) tabPlayer .getPlayer ());
44+ final CombatPlayer combatPlayer = PvPManager .getInstance ().getPlayerManager ().getUnchecked ((Player ) tabPlayer .getPlayer ());
45+ if (combatPlayer == null )
46+ return ;
4547 // wait 1 second because TAB was overwriting it
4648 ScheduleUtils .runAsyncLater (() -> {
47- final NameTag nameTag = pvPlayer .getNameTag ();
49+ final NameTag nameTag = combatPlayer .getNameTag ();
4850 if (nameTag != null )
49- nameTag .setPvP (pvPlayer .hasPvPEnabled ());
51+ nameTag .setPvP (combatPlayer .hasPvPEnabled ());
5052 }, 1 , TimeUnit .SECONDS );
5153 }
5254 });
You can’t perform that action at this time.
0 commit comments