Merge branch 'zeta120' of https://github.com/VazkiiMods/Quark into ze…

…ta120

src/main/java/org/violetmoon/quark/content/automation/block/be/FeedingTroughBlockEntity.java

@@ -82,11 +82,9 @@ public FeedResult tryFeedingAnimal(Animal animal) {
 			ItemStack stack = this.getItem(i);
 			if(animal.isFood(stack)) {
 				SoundEvent soundEvent = animal.getEatingSound(stack);
-				// Try and catch this in case soundEvent is null somewhere (Its cleaner then null checking soundEvent
-				// after warping it)
-				try {
+				if (soundEvent != null) { // Null check is kinda required, don't remove :)
 					animal.playSound(soundEvent, 0.5F + 0.5F * level.random.nextInt(2), (level.random.nextFloat() - level.random.nextFloat()) * 0.2F + 1.0F);
-				} catch (NullPointerException ignored) {}
+				}
 
 				this.addItemParticles(animal, stack, 16);