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) in offline mode. Double null check removed.

Browse Source
This commit is contained in:
caver
2014-10-04 16:36:03 +07:00
parent 9491153e30
commit 5f3af49f50
5 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,14 +79,12 @@ 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);
if (target == null) { if (target == null) {
sender.sendMessage(ChatColor.RED + "Player " + name + " not found!"); sender.sendMessage(ChatColor.RED + "Player " + name + " not found!");
return true; return true;
}
} }
} }

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());
} }
} }