minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Fix conflict with other inventory modification plugins (like JSNONAPI) i... #13

Closed
caver115 wants to merge 2 commits from master into master
pull from: master
merge into: minster586:master
Conversation 3 Commits 2 Files Changed 100 +28 -26
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5f3af49f50 - Show all commits

2
src/com/lishid/openinv/commands/OpenInvPluginCommand.java
View File

@@ -78,7 +78,6 @@ public class OpenInvPluginCommand implements CommandExecutor {
target = this.plugin.getServer().getPlayer(name); target = this.plugin.getServer().getPlayer(name);
if (target == null) {
if (target == null) { if (target == null) {
// Try loading the player's data // Try loading the player's data
target = OpenInv.playerLoader.loadPlayer(name); target = OpenInv.playerLoader.loadPlayer(name);
@@ -88,7 +87,6 @@ public class OpenInvPluginCommand implements CommandExecutor {
return true; return true;
} }
} }
}
// Permissions checks // Permissions checks
if (!OpenInv.hasPermission(player, Permissions.PERM_OVERRIDE) && OpenInv.hasPermission(target, Permissions.PERM_EXEMPT)) { if (!OpenInv.hasPermission(player, Permissions.PERM_OVERRIDE) && OpenInv.hasPermission(target, Permissions.PERM_EXEMPT)) {

3
src/com/lishid/openinv/internal/v1_7_R1/SpecialPlayerInventory.java
View File

@@ -50,7 +50,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
@Override @Override
public void InventoryRemovalCheck() { public void InventoryRemovalCheck() {
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) { // Conflict with other Offline inventory modification plugins like JSONAPI
if (transaction.isEmpty() || !playerOnline) {
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }

3
src/com/lishid/openinv/internal/v1_7_R2/SpecialPlayerInventory.java
View File

@@ -50,7 +50,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
@Override @Override
public void InventoryRemovalCheck() { public void InventoryRemovalCheck() {
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) { // Conflict with other Offline inventory modification plugins like JSONAPI
if (transaction.isEmpty() || !playerOnline) {
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }

3
src/com/lishid/openinv/internal/v1_7_R3/SpecialPlayerInventory.java
View File

@@ -50,7 +50,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
@Override @Override
public void InventoryRemovalCheck() { public void InventoryRemovalCheck() {
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) { // Conflict with other Offline inventory modification plugins like JSONAPI
if (transaction.isEmpty() || !playerOnline) {
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }

3
src/com/lishid/openinv/internal/v1_7_R4/SpecialPlayerInventory.java
View File

@@ -50,7 +50,8 @@ public class SpecialPlayerInventory extends PlayerInventory implements ISpecialP
@Override @Override
public void InventoryRemovalCheck() { public void InventoryRemovalCheck() {
owner.saveData(); owner.saveData();
if (transaction.isEmpty() && !playerOnline) { // Conflict with other Offline inventory modification plugins like JSONAPI
if (transaction.isEmpty() || !playerOnline) {
OpenInv.inventories.remove(owner.getName().toLowerCase()); OpenInv.inventories.remove(owner.getName().toLowerCase());
} }
} }