Changes

Summary

SPIGOT-6508: Rename conflicted getServer (details)

Commit cbf2f678025bc257cf6304a2a1d94408f12e9698 by md_5 SPIGOT-6508: Rename conflicted getServer
The file was modified	nms-patches/net/minecraft/core/dispenser/DispenseBehaviorShulkerBox.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockPressurePlateBinary.patch
The file was modified	nms-patches/net/minecraft/world/entity/decoration/EntityHanging.patch
The file was modified	nms-patches/net/minecraft/world/level/block/entity/TileEntityHopper.patch
The file was modified	nms-patches/net/minecraft/world/item/ItemDye.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockRedstoneTorch.patch
The file was modified	nms-patches/net/minecraft/core/dispenser/DispenseBehaviorBoat.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockTripwire.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockFireAbstract.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockPressurePlateWeighted.patch
The file was modified	nms-patches/net/minecraft/core/dispenser/DispenseBehaviorItem.patch
The file was modified	nms-patches/net/minecraft/world/entity/animal/EntityCat.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockLeaves.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockTurtleEgg.patch
The file was modified	nms-patches/net/minecraft/world/level/block/LightningRodBlock.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockConcretePowder.patch
The file was modified	nms-patches/net/minecraft/world/entity/vehicle/EntityBoat.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockEnderPortal.patch
The file was modified	src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
The file was modified	nms-patches/net/minecraft/world/level/block/BlockLever.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockFire.patch
The file was modified	nms-patches/net/minecraft/world/inventory/ContainerEnchantTable.patch
The file was modified	nms-patches/net/minecraft/world/level/World.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockFenceGate.patch
The file was modified	nms-patches/net/minecraft/core/dispenser/IDispenseBehavior.patch
The file was modified	nms-patches/net/minecraft/server/commands/CommandTeleport.patch
The file was modified	nms-patches/net/minecraft/world/item/ItemBlock.patch
The file was modified	nms-patches/net/minecraft/world/level/block/entity/TileEntityCampfire.patch
The file was modified	nms-patches/net/minecraft/world/level/chunk/Chunk.patch
The file was modified	nms-patches/net/minecraft/world/level/block/piston/BlockPiston.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockTripwireHook.patch
The file was modified	nms-patches/net/minecraft/server/AdvancementDataPlayer.patch
The file was modified	nms-patches/net/minecraft/world/entity/monster/EntityPigZombie.patch
The file was modified	nms-patches/net/minecraft/world/item/ItemLeash.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockRedstoneWire.patch
The file was modified	nms-patches/net/minecraft/world/entity/boss/enderdragon/EntityEnderCrystal.patch
The file was modified	nms-patches/net/minecraft/world/entity/monster/EntitySlime.patch
The file was modified	nms-patches/net/minecraft/world/inventory/Container.patch
The file was modified	nms-patches/net/minecraft/server/level/EntityTrackerEntry.patch
The file was modified	nms-patches/net/minecraft/world/entity/projectile/EntityLargeFireball.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockPortal.patch
The file was modified	nms-patches/net/minecraft/world/entity/player/EntityHuman.patch
The file was modified	nms-patches/net/minecraft/world/item/ItemMinecart.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockSponge.patch
The file was modified	nms-patches/net/minecraft/commands/CommandDispatcher.patch
The file was modified	nms-patches/net/minecraft/core/dispenser/DispenseBehaviorProjectile.patch
The file was modified	nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalFollowOwner.patch
The file was modified	nms-patches/net/minecraft/world/level/material/FluidTypeFlowing.patch
The file was modified	nms-patches/net/minecraft/world/entity/EntityLiving.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockTrapdoor.patch
The file was modified	nms-patches/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.patch
The file was modified	nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorUtil.patch
The file was modified	nms-patches/net/minecraft/world/entity/EntityInsentient.patch
The file was modified	nms-patches/net/minecraft/world/item/ItemArmor.patch
The file was modified	nms-patches/net/minecraft/world/entity/ai/goal/PathfinderGoalRemoveBlock.patch
The file was modified	nms-patches/net/minecraft/world/entity/monster/EntityZombie.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockMinecartDetector.patch
The file was modified	nms-patches/net/minecraft/world/level/block/entity/TileEntityBrewingStand.patch
The file was modified	nms-patches/net/minecraft/world/entity/EntityCreature.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockDoor.patch
The file was modified	nms-patches/net/minecraft/world/entity/item/EntityTNTPrimed.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockDropper.patch
The file was modified	nms-patches/net/minecraft/world/entity/monster/EntityShulker.patch
The file was modified	nms-patches/net/minecraft/server/level/PlayerChunkMap.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockCommand.patch
The file was modified	nms-patches/net/minecraft/world/entity/item/EntityItem.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockPressurePlateAbstract.patch
The file was modified	nms-patches/net/minecraft/world/level/block/SculkSensorBlock.patch
The file was modified	nms-patches/net/minecraft/world/entity/projectile/EntityArrow.patch
The file was modified	nms-patches/net/minecraft/world/entity/ai/behavior/BehaviorInteractDoor.patch
The file was modified	nms-patches/net/minecraft/world/level/Explosion.patch
The file was modified	nms-patches/net/minecraft/world/item/ItemFishingRod.patch
The file was modified	nms-patches/net/minecraft/world/entity/decoration/EntityArmorStand.patch
The file was modified	nms-patches/net/minecraft/world/item/ItemHanging.patch
The file was modified	nms-patches/net/minecraft/server/level/PlayerInteractManager.patch
The file was modified	nms-patches/net/minecraft/world/level/portal/PortalTravelAgent.patch
The file was modified	nms-patches/net/minecraft/world/entity/animal/EntitySheep.patch
The file was modified	nms-patches/net/minecraft/world/entity/projectile/EntityEgg.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockButtonAbstract.patch
The file was modified	nms-patches/net/minecraft/commands/CommandListenerWrapper.patch
The file was modified	nms-patches/net/minecraft/core/dispenser/DispenseBehaviorShears.patch
The file was modified	nms-patches/net/minecraft/world/level/block/LayeredCauldronBlock.patch
The file was modified	nms-patches/net/minecraft/world/entity/boss/wither/EntityWither.patch
The file was modified	nms-patches/net/minecraft/world/entity/monster/EntityCreeper.patch
The file was modified	nms-patches/net/minecraft/world/entity/boss/enderdragon/EntityEnderDragon.patch
The file was modified	nms-patches/net/minecraft/world/entity/Entity.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockRedstoneOre.patch
The file was modified	nms-patches/net/minecraft/world/level/block/BlockSoil.patch
The file was modified	nms-patches/net/minecraft/world/entity/projectile/EntitySmallFireball.patch
The file was modified	nms-patches/net/minecraft/server/level/EntityPlayer.patch
The file was modified	nms-patches/net/minecraft/world/entity/boss/enderdragon/phases/DragonControllerManager.patch
The file was modified	nms-patches/net/minecraft/world/level/block/entity/TileEntityFurnace.patch
The file was modified	nms-patches/net/minecraft/server/level/WorldServer.patch
The file was modified	nms-patches/net/minecraft/world/entity/projectile/EntityWitherSkull.patch
The file was modified	nms-patches/net/minecraft/world/entity/projectile/EntityFishingHook.patch