Fix server crash

BlueStaggo · BlueStaggo · commit 80e4f6ff5d94 · 2023-05-02T12:07:23.000+01:00
diff --git a/merged.patch b/merged.patch
@@ -22330,15 +22330,17 @@
  	}
  
  	public ItemStack(Item var1, int var2) {
-@@ -27,26 +34,73 @@
+@@ -27,26 +34,75 @@
  	}
  
  	public ItemStack(int var1, int var2) {
 -		this.stackSize = 0;
  		this.itemID = var1;
  		this.stackSize = var2;
 +//		this.checkMissing();
-+		this.itemDmg = Item.itemsList[var1].startingDamage;
++		if (Item.itemsList[var1] != null) {
++			this.itemDmg = Item.itemsList[var1].startingDamage;
++		}
  	}
  
  	public ItemStack(int var1, int var2, int var3) {
@@ -22348,7 +22350,7 @@
  		this.itemDmg = var3;
 +//		this.checkMissing();
 +
-+		if (this.itemDmg < 0) {
++		if (this.itemDmg < 0 && Item.itemsList[var1] != null) {
 +			this.itemDmg = Item.itemsList[var1].startingDamage;
 +		}
 +	}
@@ -22408,7 +22410,7 @@
  	}
  
  	public Item getItem() {
-@@ -57,8 +111,8 @@
+@@ -57,8 +113,8 @@
  		return this.getItem().getIconIndex(this);
  	}
  
@@ -22419,7 +22421,7 @@
  	}
  
  	public float getStrVsBlock(Block var1) {
-@@ -70,16 +124,27 @@
+@@ -70,16 +126,27 @@
  	}
  
  	public NBTTagCompound writeToNBT(NBTTagCompound var1) {
@@ -22448,7 +22450,7 @@
  	}
  
  	public int getMaxStackSize() {
-@@ -127,6 +192,75 @@
+@@ -127,6 +194,75 @@
  	}
  
  	public ItemStack copy() {

Original file line number	Diff line number	Diff line change
`@@ -22330,15 +22330,17 @@`
`22330`	`22330`	`}`
`22331`	`22331`
`22332`	`22332`	`public ItemStack(Item var1, int var2) {`
`22333`		`-@@ -27,26 +34,73 @@`
	`22333`	`+@@ -27,26 +34,75 @@`
`22334`	`22334`	`}`
`22335`	`22335`
`22336`	`22336`	`public ItemStack(int var1, int var2) {`
`22337`	`22337`	`- this.stackSize = 0;`
`22338`	`22338`	`this.itemID = var1;`
`22339`	`22339`	`this.stackSize = var2;`
`22340`	`22340`	`+// this.checkMissing();`
`22341`		`-+ this.itemDmg = Item.itemsList[var1].startingDamage;`
	`22341`	`++ if (Item.itemsList[var1] != null) {`
	`22342`	`++ this.itemDmg = Item.itemsList[var1].startingDamage;`
	`22343`	`++ }`
`22342`	`22344`	`}`
`22343`	`22345`
`22344`	`22346`	`public ItemStack(int var1, int var2, int var3) {`
`@@ -22348,7 +22350,7 @@`
`22348`	`22350`	`this.itemDmg = var3;`
`22349`	`22351`	`+// this.checkMissing();`
`22350`	`22352`	`+`
`22351`		`-+ if (this.itemDmg < 0) {`
	`22353`	`++ if (this.itemDmg < 0 && Item.itemsList[var1] != null) {`
`22352`	`22354`	`+ this.itemDmg = Item.itemsList[var1].startingDamage;`
`22353`	`22355`	`+ }`
`22354`	`22356`	`+ }`
`@@ -22408,7 +22410,7 @@`
`22408`	`22410`	`}`
`22409`	`22411`
`22410`	`22412`	`public Item getItem() {`
`22411`		`-@@ -57,8 +111,8 @@`
	`22413`	`+@@ -57,8 +113,8 @@`
`22412`	`22414`	`return this.getItem().getIconIndex(this);`
`22413`	`22415`	`}`
`22414`	`22416`
`@@ -22419,7 +22421,7 @@`
`22419`	`22421`	`}`
`22420`	`22422`
`22421`	`22423`	`public float getStrVsBlock(Block var1) {`
`22422`		`-@@ -70,16 +124,27 @@`
	`22424`	`+@@ -70,16 +126,27 @@`
`22423`	`22425`	`}`
`22424`	`22426`
`22425`	`22427`	`public NBTTagCompound writeToNBT(NBTTagCompound var1) {`
`@@ -22448,7 +22450,7 @@`
`22448`	`22450`	`}`
`22449`	`22451`
`22450`	`22452`	`public int getMaxStackSize() {`
`22451`		`-@@ -127,6 +192,75 @@`
	`22453`	`+@@ -127,6 +194,75 @@`
`22452`	`22454`	`}`
`22453`	`22455`
`22454`	`22456`	`public ItemStack copy() {`