Fix parrot hurtServer call, revert a bunch of comments

paper-server/patches/sources/net/minecraft/world/entity/animal/Parrot.java.patch

@@ -29,16 +29,18 @@
      }
  
      @Override
-@@ -387,10 +_,11 @@
-     @Override
-     public boolean hurtServer(ServerLevel level, DamageSource damageSource, float amount) {
+@@ -389,8 +_,13 @@
          if (this.isInvulnerableTo(level, damageSource)) {
-+            if (!super.hurtServer(level, damageSource, amount)) return false; // CraftBukkit
              return false;
          } else {
++            // CraftBukkit start
++            if (!super.hurtServer(level, damageSource, amount)) {
++                return false;
++            }
              this.setOrderedToSit(false);
 -            return super.hurtServer(level, damageSource, amount);
-+            return true; // CraftBukkit
++            return true;
++            // CraftBukkit
          }
      }
  

paper-server/patches/sources/net/minecraft/world/entity/animal/Turtle.java.patch

@@ -59,7 +59,7 @@
 +                    int eggCount = this.turtle.random.nextInt(4) + 1;
 +                    com.destroystokyo.paper.event.entity.TurtleLayEggEvent layEggEvent = new com.destroystokyo.paper.event.entity.TurtleLayEggEvent((org.bukkit.entity.Turtle) this.turtle.getBukkitEntity(), io.papermc.paper.util.MCUtil.toLocation(this.turtle.level(), this.blockPos.above()), eggCount);
 +                    if (layEggEvent.callEvent() && org.bukkit.craftbukkit.event.CraftEventFactory.callEntityChangeBlockEvent(this.turtle, this.blockPos.above(), Blocks.TURTLE_EGG.defaultBlockState().setValue(TurtleEggBlock.EGGS, layEggEvent.getEggCount()))) {
-+                    // Paper end
++                    // Paper end - Turtle API
                      Level level = this.turtle.level();
                      level.playSound(null, blockPos, SoundEvents.TURTLE_LAY_EGG, SoundSource.BLOCKS, 0.3F, 0.9F + level.random.nextFloat() * 0.2F);
                      BlockPos blockPos1 = this.blockPos.above();
@@ -69,7 +69,7 @@
 +                        .setValue(TurtleEggBlock.EGGS, layEggEvent.getEggCount()); // Paper
                      level.setBlock(blockPos1, blockState, 3);
                      level.gameEvent(GameEvent.BLOCK_PLACE, blockPos1, GameEvent.Context.of(this.turtle, blockState));
-+                    } // Paper
++                    } // CraftBukkit
                      this.turtle.setHasEgg(false);
                      this.turtle.setLayingEgg(false);
                      this.turtle.setInLoveTime(600);

paper-server/patches/sources/net/minecraft/world/entity/animal/Wolf.java.patch

@@ -7,7 +7,7 @@
 +            if (!super.hurtServer(level, damageSource, amount)) return false; // CraftBukkit
              this.setOrderedToSit(false);
 -            return super.hurtServer(level, damageSource, amount);
-+            return true; // CraftBUkkit
++            return true; // CraftBukkit
          }
      }