Add more checkstyle checks

By: md_5 <git@md-5.net>

paper-server/nms-patches/EntityZombie.patch

@@ -52,7 +52,7 @@
          this.drownedConversionTime = i;
          this.getDataWatcher().set(EntityZombie.DROWN_CONVERTING, true);
      }
-@@ -201,12 +216,13 @@
+@@ -201,11 +216,15 @@
      }
  
      protected void b(EntityTypes<? extends EntityZombie> entitytypes) {
@@ -62,12 +62,14 @@
          if (entityzombie != null) {
              entityzombie.y(entityzombie.world.getDamageScaler(entityzombie.getChunkCoordinates()).d());
              entityzombie.u(entityzombie.eK() && this.eU());
++            // CraftBukkit start - SPIGOT-5208: End conversion to stop event spam
++        } else {
++            ((Zombie) getBukkitEntity()).setConversionTime(-1);
++            // CraftBukkit end
          }
-+        else { ((Zombie) getBukkitEntity()).setConversionTime(-1); } // CraftBukkit - SPIGOT-5208: End conversion to stop event spam
  
      }
- 
-@@ -245,9 +261,9 @@
+@@ -245,9 +264,9 @@
                      if (SpawnerCreature.a(entitypositiontypes_surface, (IWorldReader) this.world, blockposition, entitytypes) && EntityPositionTypes.a(entitytypes, worldserver, EnumMobSpawn.REINFORCEMENT, blockposition, this.world.random)) {
                          entityzombie.setPosition((double) i1, (double) j1, (double) k1);
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.j((Entity) entityzombie) && this.world.getCubes(entityzombie) && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
@@ -79,7 +81,7 @@
                              this.getAttributeInstance(GenericAttributes.SPAWN_REINFORCEMENTS).addModifier(new AttributeModifier("Zombie reinforcement caller charge", -0.05000000074505806D, AttributeModifier.Operation.ADDITION));
                              entityzombie.getAttributeInstance(GenericAttributes.SPAWN_REINFORCEMENTS).addModifier(new AttributeModifier("Zombie reinforcement callee charge", -0.05000000074505806D, AttributeModifier.Operation.ADDITION));
                              break;
-@@ -268,7 +284,14 @@
+@@ -268,7 +287,14 @@
              float f = this.world.getDamageScaler(this.getChunkCoordinates()).b();
  
              if (this.getItemInMainHand().isEmpty() && this.isBurning() && this.random.nextFloat() < f * 0.3F) {
@@ -95,7 +97,7 @@
              }
          }
  
-@@ -349,7 +372,12 @@
+@@ -349,7 +375,12 @@
              }
  
              EntityVillager entityvillager = (EntityVillager) entityliving;
@@ -109,7 +111,7 @@
  
              entityzombievillager.prepare(worldserver, worldserver.getDamageScaler(entityzombievillager.getChunkCoordinates()), EnumMobSpawn.CONVERSION, new EntityZombie.GroupDataZombie(false, true), (NBTTagCompound) null);
              entityzombievillager.setVillagerData(entityvillager.getVillagerData());
-@@ -406,7 +434,7 @@
+@@ -406,7 +437,7 @@
                          entitychicken1.prepare(worldaccess, difficultydamagescaler, EnumMobSpawn.JOCKEY, (GroupDataEntity) null, (NBTTagCompound) null);
                          entitychicken1.setChickenJockey(true);
                          this.startRiding(entitychicken1);

paper-server/nms-patches/ItemCrossbow.patch

@@ -1,18 +1,17 @@
 --- a/net/minecraft/server/ItemCrossbow.java
 +++ b/net/minecraft/server/ItemCrossbow.java
-@@ -75,6 +75,11 @@
+@@ -74,6 +74,10 @@
+             if (itemstack1.isEmpty() && flag) {
                  itemstack1 = new ItemStack(Items.ARROW);
                  itemstack2 = itemstack1.cloneItemStack();
-             }
-+            // CraftBukkit start - SPIGOT-4870, MC-150847
-+            else if (itemstack1.isEmpty()) {
++                // CraftBukkit start - SPIGOT-4870, MC-150847
++            } else if (itemstack1.isEmpty()) {
 +                return false;
-+            }
-+            // CraftBukkit end
++                // CraftBukkit end
+             }
  
              if (!a(entityliving, itemstack, itemstack1, k > 0, flag)) {
-                 return false;
-@@ -198,11 +203,27 @@
+@@ -198,11 +202,27 @@
                  vector3fa.a(quaternion);
                  ((IProjectile) object).shoot((double) vector3fa.a(), (double) vector3fa.b(), (double) vector3fa.c(), f1, f2);
              }

paper-server/nms-patches/ItemTrident.patch

@@ -13,7 +13,7 @@
                          if (k == 0) {
                              EntityThrownTrident entitythrowntrident = new EntityThrownTrident(world, entityhuman, itemstack);
  
-@@ -54,16 +57,40 @@
+@@ -54,16 +57,39 @@
                                  entitythrowntrident.fromPlayer = EntityArrow.PickupStatus.CREATIVE_ONLY;
                              }
  
@@ -36,14 +36,13 @@
                              if (!entityhuman.abilities.canInstantlyBuild) {
                                  entityhuman.inventory.f(itemstack);
                              }
-                         }
-+                        // CraftBukkit start - SPIGOT-5458 also need in this branch :(
-+                        else {
++                            // CraftBukkit start - SPIGOT-5458 also need in this branch :(
++                        } else {
 +                            itemstack.damage(1, entityhuman, (entityhuman1) -> {
 +                                entityhuman1.broadcastItemBreak(entityliving.getRaisedHand());
 +                            });
-+                        }
-+                        // CraftBukkkit end
++                            // CraftBukkkit end
+                         }
                      }
  
                      entityhuman.b(StatisticList.ITEM_USED.b(this));

paper-server/nms-patches/PlayerConnectionUtils.patch

@@ -8,14 +8,14 @@
                  if (t0.a().isConnected()) {
                      packet.a(t0);
                  } else {
-@@ -23,5 +24,10 @@
+@@ -22,6 +23,10 @@
+ 
              });
              throw CancelledPacketHandleException.INSTANCE;
-         }
-+        // CraftBukkit start - SPIGOT-5477, MC-142590
-+        else if (MinecraftServer.getServer().hasStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) {
++            // CraftBukkit start - SPIGOT-5477, MC-142590
++        } else if (MinecraftServer.getServer().hasStopped() || (t0 instanceof PlayerConnection && ((PlayerConnection) t0).processedDisconnect)) {
 +            throw CancelledPacketHandleException.INSTANCE;
-+        }
-+        // CraftBukkit end
++            // CraftBukkit end
+         }
      }
  }

paper-server/nms-patches/TileEntityBeehive.patch

@@ -120,19 +120,18 @@
                      }
                  } else {
                      return false;
-@@ -235,6 +274,11 @@
+@@ -234,6 +273,10 @@
+ 
                  if (this.releaseBee(iblockdata, tileentitybeehive_hivebee, (List) null, tileentitybeehive_releasestatus)) {
                      iterator.remove();
-                 }
-+                // CraftBukkit start
-+                else {
++                    // CraftBukkit start
++                } else {
 +                    tileentitybeehive_hivebee.ticksInHive = tileentitybeehive_hivebee.minOccupationTicks / 2; // Not strictly Vanilla behaviour in cases where bees cannot spawn but still reasonable
-+                }
-+                // CraftBukkit end
++                    // CraftBukkit end
+                 }
              }
          }
- 
-@@ -276,6 +320,11 @@
+@@ -276,6 +319,11 @@
              this.flowerPos = GameProfileSerializer.b(nbttagcompound.getCompound("FlowerPos"));
          }
  
@@ -144,7 +143,7 @@
      }
  
      @Override
-@@ -285,6 +334,7 @@
+@@ -285,6 +333,7 @@
          if (this.x()) {
              nbttagcompound.set("FlowerPos", GameProfileSerializer.a(this.flowerPos));
          }