Skip to content

Helper Method extracted CraftInventoryCustom.java #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ottomoeller wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Helper Method extracted CraftInventoryCustom.java #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
48f30fe
We pulled a duplicate for loop out from the move method into its own
Apr 16, 2014
80951fc
We reduced an if/else statement and pulled a while loop into its own
Apr 24, 2014
4b6e598
We reverted back to the previous commit to make only one change making
Apr 24, 2014
64289c7
Merge branch 'master' of https://github.com/Ottomoeller/CraftBukkit
Apr 24, 2014
5ed92fe
We pulled a duplicate for loop out from the move method into its own
Apr 16, 2014
9a61e2b
We added an ignore to logs and Simian files
Apr 24, 2014
7b449a2
Merge branch 'master' of https://github.com/Ottomoeller/CraftBukkit.git
Apr 24, 2014
e92c187
We removed the Simian and Log files.
Apr 24, 2014
7696df0
We reset our changes so the next commit can be a more organized one for
Apr 24, 2014
c73784e
reset back to original version.
May 1, 2014
a7022ed
In CraftBlockState.java we reduced the amount of if statements in the
May 1, 2014
7aedd56
Extracted method blockStateEquals which take in the object created in
May 1, 2014
3066aba
Created a helper method for CraftInventoryCustom.java that is code that
May 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,15 @@ public boolean equals(Object obj) {
if (getClass() != obj.getClass()) {
return false;
}
return blockStateEquals(obj);
}

public boolean blockStateEquals(Object obj){
final CraftBlockState other = (CraftBlockState) obj;
if (this.world != other.world && (this.world == null || !this.world.equals(other.world))) {
return false;
}
if (this.x != other.x) {
return false;
}
if (this.y != other.y) {
return false;
}
if (this.z != other.z) {
return false;
}
if (this.type != other.type) {
if (this.x != other.x || this.y != other.y || this.z != other.z || this.type != other.type) {
return false;
}
if (this.data != other.data && (this.data == null || !this.data.equals(other.data))) {
Expand Down
45 changes: 27 additions & 18 deletions src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,32 +62,41 @@ public ItemStack getItem(int i) {
}

public ItemStack splitStack(int i, int j) {
ItemStack stack = this.getItem(i);
ItemStack result;
if (stack == null) return null;
if (stack.count <= j) {
this.setItem(i, null);
result = stack;
} else {
result = CraftItemStack.copyNMSStack(stack, j);
stack.count -= j;
}
ItemStack result = ItemStackSet(i, j);
this.update();
return result;
}

public ItemStack splitWithoutUpdate(int i) {
private ItemStack ItemStackSet(int i, int j) {
ItemStack stack = this.getItem(i);
ItemStack result;
ItemStack result = null;
if (stack == null) return null;
if (stack.count <= 1) {
this.setItem(i, null);
result = stack;
} else {
result = CraftItemStack.copyNMSStack(stack, 1);
stack.count -= 1;
if(j == Integer.MAX_VALUE){
if (stack.count <= 1) {
this.setItem(i, null);
result = stack;
} else {
result = CraftItemStack.copyNMSStack(stack, 1);
stack.count -= 1;
}
}
else {
if (stack.count <= j) {
this.setItem(i, null);
result = stack;
} else {
result = CraftItemStack.copyNMSStack(stack, j);
stack.count -= j;
}
}
return result;

}

public ItemStack splitWithoutUpdate(int i) {
int j = Integer.MAX_VALUE;
ItemStack result = ItemStackSet(i, j);
return result;
}

public void setItem(int i, ItemStack itemstack) {
Expand Down