Skip to content

Commit

Permalink
Stop checking conflicts when gm is not set
Browse files Browse the repository at this point in the history
  • Loading branch information
Pyrofab committed May 18, 2021
1 parent a9f47ae commit 1c872a1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
Version 1.2.2
------------------------------------------------------
- Fixed a desync when changing dimension through teleportation
- Fixed false positives when checking for concurrent modifications while the player's gamemode is still unset

------------------------------------------------------
Version 1.2.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ public boolean isEnabled() {
}

public void checkConflict() {
if (this.player instanceof ServerPlayerEntity
&& ((ServerPlayerEntity) this.player).interactionManager.getGameMode() == GameMode.NOT_SET) {
return;
}

boolean enabled = this.isEnabled();
this.updateBacking(this.shouldBeEnabled()); // avoid false positives from gamemode changes
boolean expected = this.isEnabled();
Expand Down

0 comments on commit 1c872a1

Please sign in to comment.