MinecraftMods/Thresholds
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix server crash in Magical Scrubber

Browse source
This commit is contained in:
zontreck 2023-12-27 12:58:38 -07:00
parent 494219a23e
commit 70453a25ca
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/dev/zontreck/otemod/blocks/entity/MagicalScrubberBlockEntity.java
View file

@ -233,7 +233,7 @@ public class MagicalScrubberBlockEntity extends BlockEntity implements MenuProvi
ItemStack main = entity.itemsHandler.getStackInSlot(0); ItemStack main = entity.itemsHandler.getStackInSlot(0);
//Map<Enchantment, Integer> enchants = main.getAllEnchantments(); //Map<Enchantment, Integer> enchants = main.getAllEnchantments();
Map<Enchantment, Integer> enchantments = ItemUtils.getEnchantments(main); Map<Enchantment, Integer> enchantments = ItemUtils.getEnchantments(main.copy());
if(enchantments.size()>0) if(enchantments.size()>0)
{ {
@ -245,7 +245,7 @@ public class MagicalScrubberBlockEntity extends BlockEntity implements MenuProvi
enchantments.remove(entry.getKey()); enchantments.remove(entry.getKey());
//iEntries.remove(); //iEntries.remove();
main = makeOutputItem(main); main = makeOutputItem(main.copy());
while(iEntries.hasNext()) while(iEntries.hasNext())
{ {
entry = iEntries.next(); entry = iEntries.next();

4
src/main/java/dev/zontreck/otemod/items/ThrownPossBall.java
View file

@ -67,7 +67,7 @@ public class ThrownPossBall extends ThrowableItemProjectile
@Override @Override
protected void onHitEntity(EntityHitResult pResult) { protected void onHitEntity(EntityHitResult pResult) {
//super.onHitEntity(pResult); super.onHitEntity(pResult);
if(getItem().getTag().contains("entity")) if(getItem().getTag().contains("entity"))
{ {
// Don't capture the entity // Don't capture the entity
@ -102,7 +102,7 @@ public class ThrownPossBall extends ThrowableItemProjectile
@Override @Override
protected void onHit(HitResult pResult) { protected void onHit(HitResult pResult) {
//super.onHit(pResult); super.onHit(pResult);
if(!this.level().isClientSide) if(!this.level().isClientSide)
{ {
// We do two things here // We do two things here