@@ -169,48 +169,66 @@ private void execStart() {
169169 }
170170
171171 private void execStop () {
172- getProxy ().getPluginManager ().unregisterCommand (mainCommand );
173- mainCommand = null ;
172+ if (mainCommand != null ) {
173+ getProxy ().getPluginManager ().unregisterCommand (mainCommand );
174+ mainCommand = null ;
175+ }
174176
175177 if (settings .getGeneralProps ().isEnabled ()) {
176178 //Do not try to do anything if the plugin has not loaded correctly
177179 if (failed ) return ;
178180
179181 if (settings .getGeneralProps ().isAutoReload ()) {
180- getProxy ().getPluginManager ().unregisterListener (reloadListener );
181- reloadListener = null ;
182+ if (reloadListener != null ) {
183+ getProxy ().getPluginManager ().unregisterListener (reloadListener );
184+ reloadListener = null ;
185+ }
182186 }
183187
184188 if (settings .getServerCheckerProps ().isEnabled ()) {
185- statusManager .stop ();
189+ if (statusManager != null ) {
190+ statusManager .stop ();
191+ }
186192 }
187193
188- if (settings .getFallbackCommandProps ().isEnabled ()) {
189- getProxy ().getPluginManager ().unregisterCommand (fallbackService );
190- }
194+ if (fallbackService != null ) {
195+ if (settings .getFallbackCommandProps ().isEnabled ()) {
196+ getProxy ().getPluginManager ().unregisterCommand (fallbackService );
197+ }
191198
192- getProxy ().getPluginManager ().unregisterListener (fallbackService );
199+ getProxy ().getPluginManager ().unregisterListener (fallbackService );
193200
194- fallbackService = null ;
201+ fallbackService = null ;
202+ }
195203
196204 if (settings .getKickHandlerProps ().isEnabled ()) {
197- getProxy ().getPluginManager ().unregisterListener (kickListener );
198- kickListener = null ;
205+ if (kickListener != null ) {
206+ getProxy ().getPluginManager ().unregisterListener (kickListener );
207+ kickListener = null ;
208+ }
199209 }
200210
201- getProxy ().getPluginManager ().unregisterListener (connectListener );
202- connectListener = null ;
211+ if (connectListener != null ) {
212+ getProxy ().getPluginManager ().unregisterListener (connectListener );
213+ connectListener = null ;
214+ }
203215
204216 if (settings .getGeneralProps ().isPluginMessaging ()) {
205- getProxy ().unregisterChannel ("PlayerBalancer" );
206- getProxy ().getPluginManager ().unregisterListener (messagingService );
207- messagingService = null ;
217+ if (messagingService != null ) {
218+ getProxy ().unregisterChannel ("PlayerBalancer" );
219+ getProxy ().getPluginManager ().unregisterListener (messagingService );
220+ messagingService = null ;
221+ }
208222 }
209223
210- getProxy ().getPluginManager ().unregisterCommand (manageCommand );
211- manageCommand = null ;
224+ if (manageCommand != null ) {
225+ getProxy ().getPluginManager ().unregisterCommand (manageCommand );
226+ manageCommand = null ;
227+ }
212228
213- sectionManager .flush ();
229+ if (sectionManager != null ) {
230+ sectionManager .flush ();
231+ }
214232
215233 ServerAssignRegistry .getTable ().clear ();
216234 }
0 commit comments