From e4d10a6d67fe8f01085bd0b112b0c06f0664d359 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 17:07:06 -0400 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes: bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException 3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches 95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType() 4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current --- Spigot-API-Patches/0001-POM-changes.patch | 6 +- .../0002-Add-FastUtil-to-Bukkit.patch | 6 +- Spigot-API-Patches/0003-Paper-Utils.patch | 6 +- Spigot-API-Patches/0004-Timings-v2.patch | 74 +++++++++---------- .../0005-Player-affects-spawning-API.patch | 6 +- .../0006-Add-getTPS-method.patch | 4 +- .../0007-Entity-Origin-API.patch | 10 +-- .../0008-Version-Command-2.0.patch | 10 +-- .../0009-Add-PlayerLocaleChangeEvent.patch | 6 +- .../0010-Add-player-view-distance-API.patch | 6 +- .../0011-Add-BeaconEffectEvent.patch | 6 +- .../0012-Add-PlayerInitialSpawnEvent.patch | 6 +- ...ly-disable-plugins-that-fail-to-load.patch | 6 +- .../0014-Expose-server-CommandMap.patch | 4 +- ...cord-chat-API-from-spigot-subclasses.patch | 10 +-- .../0016-Player-Tab-List-and-Title-APIs.patch | 8 +- .../0017-Add-exception-reporting-event.patch | 28 +++---- ...erverListPingEvent-flagging-as-Async.patch | 6 +- ...t-sendMessage-methods-to-CommandSend.patch | 6 +- ...working-with-arrows-stuck-in-living-.patch | 4 +- .../0021-Complete-resource-pack-API.patch | 8 +- .../0022-Use-ASM-for-event-executors.patch | 22 +++--- .../0023-Add-a-call-helper-to-Event.patch | 6 +- ...der-name-to-commands.yml-replacement.patch | 6 +- ...eload-permissions.yml-and-require-co.patch | 12 +-- ...6-Custom-replacement-for-eaten-items.patch | 6 +- .../0027-Access-items-by-EquipmentSlot.patch | 6 +- ...Entity-AddTo-RemoveFrom-World-Events.patch | 8 +- .../0029-EntityPathfindEvent.patch | 6 +- ...synchronization-in-MetadataStoreBase.patch | 6 +- ...d-MetadataStoreBase.removeAll-Plugin.patch | 6 +- ...0032-Add-PlayerUseUnknownEntityEvent.patch | 6 +- ...ent-to-allow-plugins-to-handle-clien.patch | 6 +- .../0034-Arrow-pickup-rule-API.patch | 6 +- ...ityRegainHealthEvent-isFastRegen-API.patch | 6 +- Spigot-API-Patches/0036-LootTable-API.patch | 28 +++---- .../0037-Add-EntityZapEvent.patch | 8 +- Spigot-API-Patches/0038-Misc-Utils.patch | 6 +- ...9-Allow-Reloading-of-Command-Aliases.patch | 4 +- ...0-Add-source-to-PlayerExpChangeEvent.patch | 6 +- .../0041-Add-ProjectileCollideEvent.patch | 6 +- ...0042-Add-String-based-Action-Bar-API.patch | 6 +- ...to-control-if-armour-stands-can-move.patch | 6 +- .../0044-IllegalPacketEvent.patch | 6 +- Spigot-API-Patches/0045-Fireworks-API-s.patch | 6 +- .../0046-PlayerTeleportEndGatewayEvent.patch | 6 +- ...rovide-E-TE-Chunk-count-stat-methods.patch | 6 +- ...PI-for-Reason-Source-Triggering-play.patch | 6 +- ...orldBorder-isInBounds-Location-check.patch | 6 +- ...n-option-to-prevent-player-names-fro.patch | 4 +- ...upstream-javadoc-warnings-and-errors.patch | 12 +-- .../0052-Item-canEntityPickup.patch | 6 +- ...PlayerPickupItemEvent-setFlyAtPlayer.patch | 6 +- .../0054-PlayerAttemptPickupItemEvent.patch | 6 +- .../0055-Add-UnknownCommandEvent.patch | 6 +- .../0056-Basic-PlayerProfile-API.patch | 4 +- .../0057-Shoulder-Entities-Release-API.patch | 6 +- .../0058-Profile-Lookup-Events.patch | 8 +- .../0059-Entity-fromMobSpawner.patch | 6 +- ...60-Improve-the-Saddle-API-for-Horses.patch | 12 +-- .../0061-ensureServerConversions-API.patch | 8 +- .../0062-Add-getI18NDisplayName-API.patch | 8 +- .../0063-ProfileWhitelistVerifyEvent.patch | 6 +- .../0064-Make-plugins-list-alphabetical.patch | 6 +- .../0065-LivingEntity-setKiller.patch | 4 +- ...efixes-in-implementation-logging-con.patch | 6 +- ...low-plugins-to-use-SLF4J-for-logging.patch | 8 +- ...or-plugins-modifying-the-parent-of-t.patch | 10 +-- .../0069-Add-PlayerJumpEvent.patch | 6 +- ...nt-protocol-version-and-virtual-host.patch | 8 +- .../0071-Add-PlayerArmorChangeEvent.patch | 6 +- ...-get-a-BlockState-without-a-snapshot.patch | 6 +- .../0073-AsyncTabCompleteEvent.patch | 8 +- ...lay-warning-on-deprecated-recipe-API.patch | 8 +- .../0075-PlayerPickupExperienceEvent.patch | 6 +- .../0076-ExperienceOrbMergeEvent.patch | 6 +- ...7-Ability-to-apply-mending-to-XP-API.patch | 6 +- .../0078-PreCreatureSpawnEvent.patch | 6 +- ...9-PlayerNaturallySpawnCreaturesEvent.patch | 6 +- ...-Add-setPlayerProfile-API-for-Skulls.patch | 8 +- .../0081-Fill-Profile-Property-Events.patch | 8 +- ...PlayerAdvancementCriterionGrantEvent.patch | 6 +- .../0083-Add-ArmorStand-Item-Meta.patch | 6 +- .../0084-Optimize-Hoppers.patch | 6 +- .../0085-Tameable-getOwnerUniqueId-API.patch | 6 +- ...e-PlayerProfile-in-AsyncPreLoginEven.patch | 6 +- ...dd-extended-PaperServerListPingEvent.patch | 10 +-- .../0088-Player.setPlayerProfile-API.patch | 6 +- .../0089-getPlayerUniqueId-API.patch | 4 +- ...-support-to-PaperServerListPingEvent.patch | 6 +- ...d-method-to-open-already-placed-sign.patch | 6 +- ...92-Add-Ban-Methods-to-Player-Objects.patch | 8 +- .../0093-EndermanEscapeEvent.patch | 6 +- .../0094-Enderman.teleportRandomly.patch | 6 +- ...tional-world.getNearbyEntities-API-s.patch | 8 +- .../0096-Location.isChunkLoaded-API.patch | 6 +- ...ld.spawnParticle-API-and-add-Builder.patch | 10 +-- .../0098-EndermanAttackPlayerEvent.patch | 6 +- ...lose-Plugin-Class-Loaders-on-Disable.patch | 12 +-- .../0100-WitchConsumePotionEvent.patch | 8 +- .../0101-WitchThrowPotionEvent.patch | 6 +- ...ion.toBlockLocation-toCenterLocation.patch | 6 +- .../0103-PotionEffect-clone-methods.patch | 6 +- .../0104-WitchReadyPotionEvent.patch | 6 +- ...0105-ItemStack-getMaxItemUseDuration.patch | 6 +- ...06-Add-EntityTeleportEndGatewayEvent.patch | 6 +- ...e-shield-blocking-delay-configurable.patch | 4 +- ...ent-consumeArrow-and-getArrowItem-AP.patch | 6 +- ...Add-getNearbyXXX-methods-to-Location.patch | 6 +- .../0110-PlayerReadyArrowEvent.patch | 6 +- ...111-Add-EntityKnockbackByEntityEvent.patch | 6 +- .../0112-Expand-Explosions-API.patch | 8 +- ...PI-additions-for-quantity-flags-lore.patch | 6 +- ...ivingEntity-Hand-Raised-Item-Use-API.patch | 4 +- .../0115-RangedEntity-API.patch | 18 ++--- .../0116-Add-World.getEntity-UUID-API.patch | 6 +- .../0117-InventoryCloseEvent-Reason-API.patch | 8 +- .../0118-Entity-getChunk-API.patch | 6 +- ...dd-an-asterisk-to-legacy-API-plugins.patch | 10 +-- .../0120-EnderDragon-Events.patch | 10 +-- .../0121-PlayerLaunchProjectileEvent.patch | 6 +- .../0122-PlayerElytraBoostEvent.patch | 6 +- .../0123-EntityTransformedEvent.patch | 6 +- ...Allow-disabling-armour-stand-ticking.patch | 6 +- .../0125-SkeletonHorse-Additions.patch | 8 +- ...126-Expand-Location-Manipulation-API.patch | 6 +- .../0127-Expand-ArmorStand-API.patch | 6 +- .../0128-AnvilDamageEvent.patch | 6 +- ...deadlock-risk-in-firing-async-events.patch | 10 +-- .../0130-Add-hand-to-bucket-events.patch | 10 +-- .../0131-Add-TNTPrimeEvent.patch | 6 +- ...vide-Chunk-Coordinates-as-a-Long-API.patch | 8 +- .../0133-Async-Chunks-API.patch | 8 +- .../0134-Make-EnderDragon-extend-Mob.patch | 6 +- ...ile-Entities-from-a-chunk-without-sn.patch | 6 +- ...hots-for-Timings-Tile-Entity-reports.patch | 6 +- ...Blocks-to-be-accessed-via-a-long-key.patch | 10 +-- .../0138-Slime-Pathfinder-Events.patch | 16 ++-- .../0139-isChunkGenerated-API.patch | 8 +- .../0140-Add-More-Creeper-API.patch | 8 +- .../0141-Add-PhantomPreSpawnEvent.patch | 8 +- ...dd-source-block-to-BlockPhysicsEvent.patch | 6 +- .../0143-Inventory-removeItemAnySlot.patch | 6 +- ...-ray-tracing-methods-to-LivingEntity.patch | 8 +- .../0145-Improve-death-events.patch | 6 +- .../0146-Mob-Pathfinding-API.patch | 8 +- ...e-attack-cooldown-methods-for-Player.patch | 6 +- ...CanPlaceOn-and-CanDestroy-NBT-values.patch | 12 +-- ...currency-Improvements-to-Permissions.patch | 6 +- ...-Add-ItemStackRecipeChoice-Draft-API.patch | 6 +- ...nt-furnace-cook-speed-multiplier-API.patch | 6 +- .../0152-PreSpawnerSpawnEvent.patch | 6 +- ...dition-on-name-for-AttributeModifier.patch | 6 +- .../0154-Material-API-additions.patch | 10 +-- .../0155-Add-Material-Tags.patch | 12 +-- ...156-Allow-setting-the-vex-s-summoner.patch | 6 +- ...157-Add-LivingEntity-getTargetEntity.patch | 8 +- .../0158-Add-sun-related-API.patch | 8 +- Spigot-API-Patches/0159-Here-s-Johnny.patch | 6 +- Spigot-API-Patches/0160-Turtle-API.patch | 12 +-- ...s-and-setters-for-EntityItem-owner-a.patch | 6 +- .../0162-Add-spectator-target-events.patch | 8 +- .../0163-Add-more-Witch-API.patch | 6 +- ...ault-permission-message-configurable.patch | 4 +- ...tion-supression-of-EntityDismount-Ve.patch | 8 +- .../0166-Add-more-Zombie-API.patch | 6 +- ...eserved-channel-check-to-be-sensible.patch | 8 +- .../0168-Add-PlayerConnectionCloseEvent.patch | 6 +- ...-replace-OfflinePlayer-getLastPlayed.patch | 6 +- .../0170-BlockDestroyEvent.patch | 6 +- ...-ItemStack-Recipe-API-helper-methods.patch | 8 +- .../0172-Add-WhitelistToggleEvent.patch | 6 +- .../0173-Annotation-Test-changes.patch | 6 +- .../0174-Entity-getEntitySpawnReason.patch | 6 +- .../0175-Add-GS4-Query-event.patch | 6 +- .../0176-Add-PlayerPostRespawnEvent.patch | 6 +- ...rivate-methods-for-nullability-annot.patch | 6 +- ...lip-some-Spigot-API-null-annotations.patch | 4 +- .../0179-Server-Tick-Events.patch | 8 +- ...0180-PlayerDeathEvent-getItemsToKeep.patch | 6 +- .../0181-Add-Heightmap-API.patch | 10 +-- .../0182-Mob-Spawner-API-Enhancements.patch | 6 +- .../0183-Add-BlockSoundGroup-interface.patch | 8 +- ...ractAtEntityEvent-javadoc-for-ArmorS.patch | 6 +- ...c-custom-world-gen-plugin-class-that.patch | 4 +- ...-custom-payload-channel-message-size.patch | 6 +- ...187-Expose-the-internal-current-tick.patch | 4 +- ...layerDeathEvent-shouldDropExperience.patch | 6 +- ...-Add-effect-to-block-break-naturally.patch | 6 +- .../0190-Add-ThrownEggHatchEvent.patch | 6 +- Spigot-API-Patches/0191-Entity-Jump-API.patch | 4 +- ...192-add-hand-to-BlockMultiPlaceEvent.patch | 4 +- Spigot-Server-Patches/0001-POM-Changes.patch | 8 +- .../0002-Paper-config-files.patch | 24 +++--- Spigot-Server-Patches/0003-MC-Dev-fixes.patch | 4 +- Spigot-Server-Patches/0004-MC-Utils.patch | 4 +- .../0005-Paper-Metrics.patch | 10 +-- ...-MinecraftKey-Information-to-Objects.patch | 12 +-- ...to-current-Chunk-for-Entity-and-Bloc.patch | 2 +- ...ts-for-each-Entity-Block-Entity-Type.patch | 6 +- Spigot-Server-Patches/0009-Timings-v2.patch | 6 +- ...ctus-and-reed-natural-growth-heights.patch | 10 +-- ...figurable-baby-zombie-movement-speed.patch | 8 +- ...012-Configurable-fishing-time-ranges.patch | 8 +- ...d-mobs-to-jump-and-take-water-damage.patch | 6 +- ...-despawn-distances-for-living-entiti.patch | 4 +- ...5-Allow-for-toggling-of-spawn-chunks.patch | 8 +- ...ck-and-tnt-entities-at-the-specified.patch | 2 +- ...ient-crashes-server-lists-and-Mojang.patch | 14 ++-- .../0018-Implement-Paper-VersionChecker.patch | 8 +- ...d-version-history-to-version-command.patch | 4 +- .../0020-Player-affects-spawning-API.patch | 4 +- ...ve-invalid-mob-spawner-tile-entities.patch | 6 +- .../0022-Optimize-TileEntity-Ticking.patch | 8 +- ...023-Further-improve-server-tick-loop.patch | 10 +-- ...024-Only-refresh-abilities-if-needed.patch | 6 +- .../0025-Entity-Origin-API.patch | 2 +- ...event-tile-entity-and-entity-crashes.patch | 8 +- ...nfigurable-top-of-nether-void-damage.patch | 6 +- ...e-before-converting-and-renaming-pla.patch | 6 +- .../0029-Always-tick-falling-blocks.patch | 6 +- .../0030-Configurable-end-credits.patch | 4 +- ...-explosions-processing-dead-entities.patch | 8 +- .../0032-Optimize-explosions.patch | 12 +-- .../0033-Disable-explosion-knockback.patch | 10 +-- .../0034-Disable-thunder.patch | 6 +- .../0035-Disable-ice-and-snow.patch | 6 +- ...6-Configurable-mob-spawner-tick-rate.patch | 8 +- ...sition-the-first-time-an-entity-is-s.patch | 6 +- .../0038-Add-BeaconEffectEvent.patch | 6 +- ...figurable-container-update-tick-rate.patch | 4 +- .../0040-Use-UserCache-for-player-heads.patch | 6 +- .../0041-Disable-spigot-tick-limiters.patch | 6 +- .../0042-Add-PlayerInitialSpawnEvent.patch | 6 +- ...urable-Disabling-Cat-Chest-Detection.patch | 8 +- ...44-Ensure-commands-are-not-ran-async.patch | 14 ++-- ...chunks-are-slime-spawn-chunks-toggle.patch | 8 +- .../0046-Expose-server-CommandMap.patch | 6 +- ...e-informative-in-maxHealth-exception.patch | 4 +- .../0048-Player-Tab-List-and-Title-APIs.patch | 10 +-- .../0049-Ensure-inv-drag-is-in-bounds.patch | 6 +- ...entation-of-tile-entity-removal-list.patch | 6 +- ...dd-configurable-portal-search-radius.patch | 2 +- .../0052-Add-velocity-warnings.patch | 10 +-- ...ble-inter-world-teleportation-safety.patch | 8 +- .../0054-Add-exception-reporting-event.patch | 26 +++---- ...-don-t-need-to-when-cerealising-text.patch | 6 +- ...oreboards-for-non-players-by-default.patch | 2 +- ...working-with-arrows-stuck-in-living-.patch | 4 +- .../0058-Complete-resource-pack-API.patch | 8 +- .../0059-Chunk-Save-Reattempt.patch | 8 +- ...ading-permissions.yml-before-plugins.patch | 8 +- ...llow-Reloading-of-Custom-Permissions.patch | 6 +- .../0062-Remove-Metadata-on-reload.patch | 6 +- .../0063-Undead-horse-leashing.patch | 8 +- ...064-Handle-Item-Meta-Inconsistencies.patch | 4 +- ...urable-Non-Player-Arrow-Despawn-Rate.patch | 8 +- .../0066-Add-World-Util-Methods.patch | 8 +- ...7-Custom-replacement-for-eaten-items.patch | 6 +- ...th-absorb-values-and-repair-bad-data.patch | 8 +- .../0069-Waving-banner-workaround.patch | 6 +- ...070-Use-a-Shared-Random-for-Entities.patch | 6 +- ...le-spawn-chances-for-skeleton-horses.patch | 6 +- ...Location-getType-and-getBlockData-fo.patch | 12 +-- .../0073-Access-items-by-EquipmentSlot.patch | 6 +- ...ckPhysicsEvent-if-a-plugin-has-a-lis.patch | 14 ++-- ...Entity-AddTo-RemoveFrom-World-Events.patch | 4 +- ...76-Configurable-Chunk-Inhabited-Time.patch | 8 +- .../0077-EntityPathfindEvent.patch | 10 +-- ...egionFileCache-and-make-configurable.patch | 8 +- ...9-Do-not-load-chunks-for-Pathfinding.patch | 12 +-- ...0080-Add-PlayerUseUnknownEntityEvent.patch | 8 +- ...dDebugInfo-not-initialized-on-client.patch | 6 +- ...-Configurable-Grass-Spread-Tick-Rate.patch | 8 +- ...g-BlockPlaceEvent-triggering-physics.patch | 6 +- ...84-Remove-Debug-checks-from-DataBits.patch | 6 +- ...nilla-per-world-scoreboard-coloring-.patch | 10 +-- ...nd-for-setting-passengers-on-players.patch | 6 +- ...Remove-unused-World-Tile-Entity-List.patch | 4 +- .../0088-Don-t-tick-Skulls-unused-code.patch | 6 +- .../0089-Configurable-Player-Collision.patch | 12 +-- ...ent-to-allow-plugins-to-handle-clien.patch | 6 +- .../0091-Configurable-RCON-IP-address.patch | 10 +-- ...092-Prevent-Fire-from-loading-chunks.patch | 6 +- ...93-Implement-PlayerLocaleChangeEvent.patch | 4 +- ...ityRegainHealthEvent-isFastRegen-API.patch | 8 +- ...-to-configure-frosted_ice-properties.patch | 8 +- ...-possibility-for-getServer-singleton.patch | 6 +- ...item-frames-performance-and-bug-fixe.patch | 4 +- ...-API-Replenishable-Lootables-Feature.patch | 36 ++++----- ...y-scoreboard-teams-to-scoreboard.dat.patch | 8 +- ...tem-property-for-disabling-watchdoge.patch | 6 +- .../0101-Optimize-UserCache-Thread-Safe.patch | 8 +- ...blocking-on-Network-Manager-creation.patch | 4 +- ...3-Optional-TNT-doesn-t-move-in-water.patch | 2 +- ...r-redstone-torch-rapid-clock-removal.patch | 8 +- .../0105-Add-server-name-parameter.patch | 6 +- ...on-Wither-Death-sounds-to-same-world.patch | 8 +- .../0107-Fix-Double-World-Add-issues.patch | 4 +- .../0108-Fix-Old-Sign-Conversion.patch | 10 +-- ...e-profiles-that-have-no-UUID-and-no-.patch | 6 +- ...mative-vehicle-moved-wrongly-message.patch | 6 +- ...ers-that-dismount-from-other-players.patch | 4 +- ...setting-for-proxy-online-mode-status.patch | 10 +-- ...ptimise-BlockState-s-hashCode-equals.patch | 12 +-- ...onfigurable-packet-in-spam-threshold.patch | 8 +- ...15-Configurable-flying-kick-messages.patch | 8 +- .../0116-Chunk-registration-fixes.patch | 4 +- ...ok-reference-on-Craft-Entity-removal.patch | 6 +- ...uto-fix-bad-Y-levels-on-player-login.patch | 4 +- ...tion-to-remove-corrupt-tile-entities.patch | 8 +- .../0120-Add-EntityZapEvent.patch | 10 +-- ...a-from-ArmorStand-and-SpawnEgg-items.patch | 8 +- ...122-Cache-user-authenticator-threads.patch | 4 +- .../0123-Optimise-removeQueue.patch | 6 +- ...4-Allow-Reloading-of-Command-Aliases.patch | 6 +- ...5-Add-source-to-PlayerExpChangeEvent.patch | 8 +- ...6-Don-t-let-fishinghooks-use-portals.patch | 8 +- .../0127-Add-ProjectileCollideEvent.patch | 4 +- ...vent-Pathfinding-out-of-World-Border.patch | 6 +- ...imize-World.isLoaded-BlockPosition-Z.patch | 6 +- ...-Bound-Treasure-Maps-to-World-Border.patch | 8 +- ...figurable-Cartographer-Treasure-Maps.patch | 8 +- .../0132-Optimize-ItemStack.isEmpty.patch | 6 +- ...to-control-if-armour-stands-can-move.patch | 8 +- ...34-Properly-fix-item-duplication-bug.patch | 8 +- .../0135-String-based-Action-Bar-API.patch | 2 +- .../0136-Firework-API-s.patch | 14 ++-- .../0137-PlayerTeleportEndGatewayEvent.patch | 6 +- ...rovide-E-TE-Chunk-count-stat-methods.patch | 4 +- .../0139-Enforce-Sync-Player-Saves.patch | 6 +- ...llow-entities-to-ride-themselves-572.patch | 2 +- ...PI-for-Reason-Source-Triggering-play.patch | 4 +- .../0142-Cap-Entity-Collisions.patch | 6 +- ...e-CraftScheduler-Async-Task-Debugger.patch | 6 +- ...more-aggressive-in-the-chunk-unload-.patch | 6 +- .../0145-Do-not-let-armorstands-drown.patch | 8 +- ...le-async-calls-to-restart-the-server.patch | 10 +-- ...property-to-disable-book-size-limits.patch | 6 +- ...ke-parrots-stay-on-shoulders-despite.patch | 10 +-- ...n-option-to-prevent-player-names-fro.patch | 8 +- ...oleAppender-for-console-improvements.patch | 32 ++++---- ...urable-option-to-disable-creeper-lin.patch | 8 +- .../0152-Item-canEntityPickup.patch | 4 +- ...PlayerPickupItemEvent-setFlyAtPlayer.patch | 6 +- .../0154-PlayerAttemptPickupItemEvent.patch | 6 +- .../0155-Add-UnknownCommandEvent.patch | 6 +- .../0156-Basic-PlayerProfile-API.patch | 2 +- .../0157-Shoulder-Entities-Release-API.patch | 4 +- .../0158-Profile-Lookup-Events.patch | 6 +- ...player-logins-during-server-shutdown.patch | 6 +- .../0160-Entity-fromMobSpawner.patch | 6 +- ...61-Improve-the-Saddle-API-for-Horses.patch | 10 +-- ...mplement-ensureServerConversions-API.patch | 6 +- .../0163-Implement-getI18NDisplayName.patch | 8 +- .../0164-ProfileWhitelistVerifyEvent.patch | 6 +- .../0165-Fix-this-stupid-bullshit.patch | 6 +- ...awns-should-honor-nametags-and-leash.patch | 6 +- ...imer-when-spawner-event-is-cancelled.patch | 4 +- ...68-Fix-MC-117075-TE-Unload-Lag-Spike.patch | 6 +- ...-a-custom-authentication-servers-dow.patch | 8 +- .../0170-LivingEntity-setKiller.patch | 4 +- ...ams-to-redirect-System.out-err-to-lo.patch | 6 +- ...n-prefixes-using-Log4J-configuration.patch | 10 +-- ...-Include-Log4J2-SLF4J-implementation.patch | 6 +- ...refix-for-various-plugins-bypassing-.patch | 6 +- .../0175-Add-PlayerJumpEvent.patch | 6 +- ...6-handle-PacketPlayInKeepAlive-async.patch | 6 +- ...nt-protocol-version-and-virtual-host.patch | 14 ++-- ...rt-serverside-behavior-of-keepalives.patch | 6 +- ...dEffects-only-to-players-who-can-see.patch | 8 +- ...-maximum-exp-value-when-merging-orbs.patch | 8 +- .../0181-Add-PlayerArmorChangeEvent.patch | 8 +- ...rom-being-processed-when-the-player-.patch | 6 +- ...e-implementations-for-captured-block.patch | 6 +- ...-get-a-BlockState-without-a-snapshot.patch | 12 +-- .../0185-AsyncTabCompleteEvent.patch | 10 +-- ...186-Avoid-NPE-in-PathfinderGoalTempt.patch | 6 +- .../0187-PlayerPickupExperienceEvent.patch | 6 +- .../0188-ExperienceOrbMergeEvent.patch | 6 +- ...9-Ability-to-apply-mending-to-XP-API.patch | 10 +-- ...-max-squid-spawn-height-configurable.patch | 8 +- .../0191-PreCreatureSpawnEvent.patch | 8 +- ...2-PlayerNaturallySpawnCreaturesEvent.patch | 10 +-- ...-Add-setPlayerProfile-API-for-Skulls.patch | 8 +- .../0194-Fill-Profile-Property-Events.patch | 6 +- ...PlayerAdvancementCriterionGrantEvent.patch | 6 +- .../0196-Add-ArmorStand-Item-Meta.patch | 6 +- ...-Extend-Player-Interact-cancellation.patch | 6 +- .../0198-Tameable-getOwnerUniqueId-API.patch | 8 +- ...r-crits-helps-mitigate-hacked-client.patch | 8 +- ...ting-location-from-InventoryEnderChe.patch | 6 +- ...sted-Ice-from-loading-holding-chunks.patch | 6 +- ...le-Explicit-Network-Manager-Flushing.patch | 6 +- ...nt-extended-PaperServerListPingEvent.patch | 18 ++--- .../0204-Improved-Async-Task-Scheduler.patch | 8 +- ...e-PlayerProfile-in-AsyncPreLoginEven.patch | 6 +- .../0206-Player.setPlayerProfile-API.patch | 4 +- .../0207-Fix-Dragon-Server-Crashes.patch | 6 +- .../0208-getPlayerUniqueId-API.patch | 6 +- ...Make-player-data-saving-configurable.patch | 8 +- ...ke-legacy-ping-handler-more-reliable.patch | 6 +- ...ServerListPingEvent-for-legacy-pings.patch | 8 +- ...12-Flag-to-disable-the-channel-limit.patch | 4 +- ...d-method-to-open-already-placed-sign.patch | 6 +- ...urable-sprint-interruption-on-attack.patch | 8 +- ...-allowed-colored-signs-to-be-created.patch | 6 +- .../0216-EndermanEscapeEvent.patch | 6 +- .../0217-Enderman.teleportRandomly.patch | 8 +- ...0218-Block-Enderpearl-Travel-Exploit.patch | 8 +- ...ld.spawnParticle-API-and-add-Builder.patch | 4 +- .../0220-EndermanAttackPlayerEvent.patch | 6 +- .../0221-WitchConsumePotionEvent.patch | 6 +- .../0222-WitchThrowPotionEvent.patch | 6 +- ...Item-entities-with-World.spawnEntity.patch | 4 +- .../0224-WitchReadyPotionEvent.patch | 6 +- ...0225-ItemStack-getMaxItemUseDuration.patch | 8 +- ...lement-EntityTeleportEndGatewayEvent.patch | 6 +- ...ed-flag-on-cancel-of-Explosion-Event.patch | 6 +- .../0228-Fix-CraftEntity-hashCode.patch | 6 +- ...le-Alternative-LootPool-Luck-Formula.patch | 8 +- ...ils-when-failing-to-save-player-data.patch | 6 +- ...e-shield-blocking-delay-configurable.patch | 4 +- ...ent-consumeArrow-and-getArrowItem-AP.patch | 10 +-- .../0233-PlayerReadyArrowEvent.patch | 4 +- ...e-EntityShootBowEvent-for-Illusioner.patch | 4 +- ...plement-EntityKnockbackByEntityEvent.patch | 4 +- .../0236-Expand-Explosions-API.patch | 4 +- ...ivingEntity-Hand-Raised-Item-Use-API.patch | 6 +- .../0238-RangedEntity-API.patch | 18 ++--- ...to-disable-ender-dragon-legacy-check.patch | 4 +- ...0-Implement-World.getEntity-UUID-API.patch | 4 +- .../0241-InventoryCloseEvent-Reason-API.patch | 4 +- .../0242-Configurable-Bed-Search-Radius.patch | 6 +- .../0243-Vex-getSummoner-API.patch | 6 +- ...nventory-when-cancelling-PlayerInter.patch | 4 +- ...ge-the-Entity-Random-seed-for-squids.patch | 4 +- ...nilla-entity-warnings-for-duplicates.patch | 4 +- ...e-if-stack-size-above-max-stack-size.patch | 4 +- ...248-Use-asynchronous-Log4j-2-loggers.patch | 8 +- ...-more-information-to-Entity.toString.patch | 2 +- ...ies-option-to-debug-dupe-uuid-issues.patch | 6 +- .../0251-EnderDragon-Events.patch | 8 +- .../0252-PlayerElytraBoostEvent.patch | 4 +- ...-Speedup-BlockPos-by-fixing-inlining.patch | 6 +- .../0254-Optimize-RegistryID.c.patch | 4 +- ...t-armor-stands-from-doing-entity-loo.patch | 6 +- ...6-Vanished-players-don-t-have-rights.patch | 20 ++--- ...-anytime-entities-change-to-guarante.patch | 4 +- ...dd-some-Debug-to-Chunk-Entity-slices.patch | 6 +- .../0259-EntityTransformedEvent.patch | 10 +-- .../0260-SkeletonHorse-Additions.patch | 8 +- ...revent-Saving-Bad-entities-to-chunks.patch | 4 +- ...on-t-call-getItemMeta-on-hasItemMeta.patch | 6 +- ...ead-Entities-in-entityList-iteration.patch | 6 +- ...264-MC-111480-Start-Entity-ID-s-at-1.patch | 4 +- ...65-Implement-Expanded-ArmorStand-API.patch | 6 +- .../0266-AnvilDamageEvent.patch | 4 +- .../0267-Add-TNTPrimeEvent.patch | 8 +- ...nd-make-tab-spam-limits-configurable.patch | 6 +- .../0269-Add-hand-to-bucket-events.patch | 8 +- ...6-Experience-should-save-as-Integers.patch | 4 +- ...ient-rendering-skulls-from-same-user.patch | 10 +-- ...dd-Early-Warning-Feature-to-WatchDog.patch | 12 +-- .../0273-Make-EnderDragon-implement-Mob.patch | 4 +- ...74-Use-ConcurrentHashMap-in-JsonList.patch | 4 +- ...75-Use-a-Queue-for-Queueing-Commands.patch | 4 +- ...ile-Entities-from-a-chunk-without-sn.patch | 4 +- ...Allow-disabling-armour-stand-ticking.patch | 10 +-- ...ptimize-BlockPosition-helper-methods.patch | 4 +- ...ets-from-world-player-list-not-serve.patch | 4 +- ...store-vanlla-default-mob-spawn-range.patch | 4 +- ...281-Optimize-CraftBlockData-Creation.patch | 6 +- .../0282-Fix-MC-124320.patch | 6 +- .../0283-Slime-Pathfinder-Events.patch | 6 +- ...le-speed-for-water-flowing-over-lava.patch | 6 +- .../0285-Optimize-RegistryMaterials.patch | 4 +- .../0286-Add-PhantomPreSpawnEvent.patch | 8 +- .../0287-Add-More-Creeper-API.patch | 6 +- .../0288-Inventory-removeItemAnySlot.patch | 4 +- ...loadChunk-int-int-false-load-unconve.patch | 4 +- ...-ray-tracing-methods-to-LivingEntity.patch | 6 +- ...e-attack-cooldown-methods-for-Player.patch | 6 +- .../0292-Improve-death-events.patch | 2 +- ...ow-chests-to-be-placed-with-NBT-data.patch | 6 +- .../0294-Mob-Pathfinding-API.patch | 12 +-- ...ent-chunk-loading-from-Fluid-Flowing.patch | 4 +- ...-for-CanPlaceOn-and-CanDestroy-NBT-v.patch | 6 +- ...ent-Mob-AI-Rules-from-Loading-Chunks.patch | 6 +- ...wning-from-loading-generating-chunks.patch | 4 +- ...e-Biome-Mob-Lookups-for-Mob-Spawning.patch | 4 +- ...nt-furnace-cook-speed-multiplier-API.patch | 6 +- .../0301-Support-Overriding-World-Seeds.patch | 10 +-- .../0302-Optimize-Server-World-Map.patch | 6 +- .../0303-PreSpawnerSpawnEvent.patch | 4 +- ...arseException-in-Entity-and-TE-names.patch | 4 +- .../0305-Avoid-dimension-id-collisions.patch | 4 +- .../0306-Honor-EntityAgeable.ageLock.patch | 4 +- ...ble-connection-throttle-kick-message.patch | 6 +- .../0308-Hook-into-CB-plugin-rewrites.patch | 4 +- ...309-Allow-setting-the-vex-s-summoner.patch | 6 +- .../0310-Add-sun-related-API.patch | 4 +- ...owned-for-Villager-Aggression-Config.patch | 4 +- .../0312-Here-s-Johnny.patch | 6 +- Spigot-Server-Patches/0313-Turtle-API.patch | 6 +- ...mit-lightning-strike-effect-distance.patch | 4 +- ...ther-worlds-for-shooter-of-projectil.patch | 4 +- ...-Call-player-spectator-target-events.patch | 4 +- ...7-Add-Velocity-IP-Forwarding-Support.patch | 20 ++--- .../0318-Add-more-Witch-API.patch | 6 +- Spigot-Server-Patches/0319-Fix-MC-93764.patch | 4 +- ...event-players-from-moving-into-unloa.patch | 6 +- ...21-Reset-players-airTicks-on-respawn.patch | 2 +- ...-after-profile-lookups-if-not-needed.patch | 4 +- ...ble-thread-count-default-for-bootstr.patch | 4 +- .../0324-Optimize-World-Time-Updates.patch | 4 +- ...store-custom-InventoryHolder-support.patch | 4 +- .../0326-Use-Vanilla-Minecart-Speeds.patch | 4 +- .../0327-Fix-SpongeAbsortEvent-handling.patch | 6 +- ...t-allow-digging-into-unloaded-chunks.patch | 4 +- .../0329-Optimize-redstone-algorithm.patch | 10 +-- ...entity-dismount-during-teleportation.patch | 2 +- .../0331-Book-Size-Limits.patch | 6 +- ...ault-permission-message-configurable.patch | 6 +- .../0333-Add-more-Zombie-API.patch | 8 +- ...Prevent-rayTrace-from-loading-chunks.patch | 4 +- ...e-Large-Packets-disconnecting-client.patch | 12 +-- ...-world-storage-in-CraftOfflinePlayer.patch | 4 +- .../0337-Add-PlayerConnectionCloseEvent.patch | 6 +- ...Prevent-Enderman-from-loading-chunks.patch | 4 +- ...-replace-OfflinePlayer-getLastPlayed.patch | 10 +-- .../0340-Fix-PlayerEditBookEvent.patch | 4 +- ...vehicle-tracking-issue-on-disconnect.patch | 4 +- ...onRetractEvent-for-all-empty-pistons.patch | 4 +- ...-remove-from-being-called-on-Players.patch | 4 +- .../0344-BlockDestroyEvent.patch | 4 +- ...om-Shapeless-Custom-Crafting-Recipes.patch | 4 +- .../0346-Fix-sign-edit-memory-leak.patch | 6 +- .../0347-Limit-Client-Sign-length-more.patch | 4 +- ...ConvertSigns-boolean-every-sign-save.patch | 4 +- ...-Signs-in-Chunks-creating-too-large-.patch | 8 +- ...0-Fix-Whitelist-On-Off-inconsistency.patch | 6 +- ...st-tick-at-start-of-drowning-process.patch | 4 +- ...352-Allow-Saving-of-Oversized-Chunks.patch | 8 +- ...oggleEvent-when-whitelist-is-toggled.patch | 4 +- ...354-Add-LivingEntity-getTargetEntity.patch | 2 +- ...ength-when-serialising-BungeeCord-te.patch | 4 +- .../0356-Entity-getEntitySpawnReason.patch | 6 +- ...ity-Metadata-for-all-tracked-players.patch | 6 +- .../0358-Fire-event-on-GS4-query.patch | 8 +- ...359-Implement-PlayerPostRespawnEvent.patch | 4 +- ...-for-pickupDelay-breaks-picking-up-i.patch | 4 +- ...s-and-setters-for-EntityItem-owner-a.patch | 4 +- .../0362-Server-Tick-Events.patch | 4 +- ...0363-PlayerDeathEvent-getItemsToKeep.patch | 4 +- ...-Optimize-Captured-TileEntity-Lookup.patch | 4 +- .../0365-Add-Heightmap-API.patch | 4 +- .../0366-Mob-Spawner-API-Enhancements.patch | 6 +- ...layer-View-Distance-API-placeholders.patch | 8 +- ...l-to-changed-postToMainThread-method.patch | 4 +- ...n-item-frames-are-modified-MC-123450.patch | 6 +- ...isPrimaryThread-and-MinecraftServer-.patch | 6 +- ...h-entity-loss-due-to-unloaded-chunks.patch | 4 +- .../0372-Duplicate-UUID-Resolve-Option.patch | 2 +- ...373-improve-CraftWorld-isChunkLoaded.patch | 4 +- ...le-Keep-Spawn-Loaded-range-per-world.patch | 2 +- ...x-some-generation-concurrency-issues.patch | 8 +- ...tityAreaEffectCloud-from-going-negat.patch | 4 +- .../0377-ChunkMapDistance-CME.patch | 4 +- .../0378-Implement-CraftBlockSoundGroup.patch | 10 +-- .../0379-Chunk-debug-command.patch | 8 +- .../0380-incremental-chunk-saving.patch | 8 +- ...eptions-from-dispenser-entity-spawns.patch | 4 +- ...382-Fix-World-isChunkGenerated-calls.patch | 2 +- ...ate-location-if-we-failed-to-read-it.patch | 4 +- ...ead-in-DataPaletteBlock-lock-failure.patch | 6 +- ...Status-cache-when-saving-protochunks.patch | 2 +- Spigot-Server-Patches/0386-Anti-Xray.patch | 2 +- ...al-Spawned-mobs-towards-natural-spaw.patch | 6 +- ...gurable-projectile-relative-velocity.patch | 8 +- ...-being-ticked-when-notifying-navigat.patch | 2 +- .../0390-offset-item-frame-ticking.patch | 4 +- ...opper-searches-if-there-are-no-items.patch | 6 +- ...92-Asynchronous-chunk-IO-and-loading.patch | 2 +- ...etChunkIfLoadedImmediately-in-places.patch | 2 +- .../0394-Reduce-sync-loads.patch | 12 +-- ...lement-alternative-item-despawn-rate.patch | 6 +- ...if-we-have-a-custom-Bukkit-generator.patch | 6 +- .../0397-Fix-MC-158900.patch | 4 +- ...ement-optional-per-player-mob-spawns.patch | 8 +- ...revent-consuming-the-wrong-itemstack.patch | 4 +- ...assanger-entities-once-from-spawners.patch | 4 +- .../0401-Fix-nether-portal-creation.patch | 4 +- .../0402-Generator-Settings.patch | 6 +- ...ro-tick-instant-grow-farms-MC-113809.patch | 6 +- .../0404-Fix-MC-161754.patch | 4 +- ...ce-improvement-for-Chunk.getEntities.patch | 4 +- ...hanging-entities-that-are-not-ItemFr.patch | 4 +- ...407-Expose-the-internal-current-tick.patch | 4 +- ...-sneak-when-changing-worlds-MC-10657.patch | 6 +- ...d-option-to-disable-pillager-patrols.patch | 6 +- ...or-when-player-hand-set-to-empty-typ.patch | 6 +- .../0411-PlayerLaunchProjectileEvent.patch | 18 ++--- ...ftMagicNumbers.isSupportedApiVersion.patch | 4 +- ...nk-loads-when-villagers-try-to-find-.patch | 4 +- ...-Fix-spawn-radius-being-treated-as-0.patch | 4 +- ...5656-Fix-Follow-Range-Initial-Target.patch | 8 +- .../0416-Optimize-Hoppers.patch | 12 +-- ...layerDeathEvent-shouldDropExperience.patch | 4 +- ...oading-chunks-checking-hive-position.patch | 4 +- ...Chunks-from-Hoppers-and-other-things.patch | 4 +- ...rializing-mismatching-chunk-coordina.patch | 6 +- ...timise-IEntityAccess-getPlayerByUUID.patch | 6 +- ...0422-Fix-items-not-falling-correctly.patch | 4 +- .../0423-Lag-compensate-eating.patch | 4 +- ...mize-call-to-getFluid-for-explosions.patch | 4 +- ...k-in-stack-not-having-effects-when-d.patch | 4 +- .../0426-Activation-Range-Improvements.patch | 6 +- ...-Add-effect-to-block-break-naturally.patch | 4 +- .../0428-Tracking-Range-Improvements.patch | 4 +- ...ator-behavior-for-EntityPhanton-goal.patch | 4 +- ...x-items-vanishing-through-end-portal.patch | 2 +- .../0431-Seed-based-feature-search.patch | 12 +-- ...get-gravity-in-void.-Fixes-MC-167279.patch | 8 +- ...e-getChunkAt-calls-for-loaded-chunks.patch | 6 +- ...-more-tolerant-of-invalid-attributes.patch | 4 +- ...ow-overriding-the-java-version-check.patch | 4 +- .../0436-Add-ThrownEggHatchEvent.patch | 4 +- .../0437-Optimise-random-block-ticking.patch | 6 +- .../0438-Entity-Jump-API.patch | 8 +- ...n-to-nerf-pigmen-from-nether-portals.patch | 2 +- .../0440-fix-blockstate-capture-undoing.patch | 4 +- .../0441-Make-the-GUI-graph-fancier.patch | 2 +- .../0442-Backport-fix-for-MC-167561.patch | 2 +- ...443-add-hand-to-BlockMultiPlaceEvent.patch | 2 +- ...44-Prevent-teleporting-dead-entities.patch | 2 +- ...ripwire-hook-placement-before-update.patch | 2 +- ...to-allow-iron-golems-to-spawn-in-air.patch | 2 +- ...-chance-of-villager-zombie-infection.patch | 2 +- .../0448-Optimise-Chunk-getFluid.patch | 4 +- ...imise-TickListServer-by-rewriting-it.patch | 6 +- ...educe-entity-tracker-updates-on-move.patch | 2 +- ...spawn-settings-and-per-player-option.patch | 12 +-- ...re-Entity-is-never-double-registered.patch | 4 +- ...ering-entities-from-unloading-chunks.patch | 2 +- ...nnections-shouldn-t-hold-up-shutdown.patch | 2 +- ...low-bees-to-load-chunks-for-beehives.patch | 2 +- ...-PlayerChunkMap-adds-crashing-server.patch | 2 +- ...on-Chunk-lookup-and-avoid-loading-fa.patch | 4 +- paper | 2 +- scripts/upstreamMerge.sh | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 653 files changed, 2156 insertions(+), 2156 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index a387ba2c3..4d9703d31 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 4ad4bdf9fc777147561c4f62fbd84bba4fef3271 Mon Sep 17 00:00:00 2001 +From 755a3e8943286365b0f518c5423687872c8181ae Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 044afc49..8c443c52 100644 +index 8964b9e33..ce09baeab 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,28 @@ @@ -111,5 +111,5 @@ index 044afc49..8c443c52 100644 true -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch index 83d7fb759..dcb571f54 100644 --- a/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch +++ b/Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch @@ -1,4 +1,4 @@ -From c34a0b40b799e91263262c942be9994f6aaed9b7 Mon Sep 17 00:00:00 2001 +From 747cc281e224953dc859384efe4466cb165a90ef Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 1 Apr 2016 00:02:47 -0400 Subject: [PATCH] Add FastUtil to Bukkit @@ -6,7 +6,7 @@ Subject: [PATCH] Add FastUtil to Bukkit Doesn't expose to plugins, just allows Paper-API to use it for optimization diff --git a/pom.xml b/pom.xml -index 8c443c52..a540adef 100644 +index ce09baeab..3cfbff14b 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,12 @@ @@ -23,5 +23,5 @@ index 8c443c52..a540adef 100644 commons-lang commons-lang -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0003-Paper-Utils.patch b/Spigot-API-Patches/0003-Paper-Utils.patch index e3dd1fa17..38a29d0e0 100644 --- a/Spigot-API-Patches/0003-Paper-Utils.patch +++ b/Spigot-API-Patches/0003-Paper-Utils.patch @@ -1,4 +1,4 @@ -From 987a04e5fe2faa15848c4e8ce6c6c63e12da47cd Mon Sep 17 00:00:00 2001 +From d7f401b6507cf6813a6e17cd0ad3df6d35d3a9e7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 23 Feb 2019 11:26:21 -0500 Subject: [PATCH] Paper Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Paper Utils diff --git a/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java new file mode 100644 -index 00000000..9db0056a +index 000000000..9db0056ab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/SneakyThrow.java @@ -0,0 +1,16 @@ @@ -27,5 +27,5 @@ index 00000000..9db0056a + +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index fb75376eb..ba560e56d 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 954f387075f7d94134b6b65ebce3183d4dbd2b1d Mon Sep 17 00:00:00 2001 +From 1259145a44b220f48c733e013571a00df801065f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java new file mode 100644 -index 00000000..64531fcc +index 000000000..64531fcce --- /dev/null +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java @@ -0,0 +1,84 @@ @@ -96,7 +96,7 @@ index 00000000..64531fcc +} diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java new file mode 100644 -index 00000000..9b45ce88 +index 000000000..9b45ce887 --- /dev/null +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java @@ -0,0 +1,68 @@ @@ -170,7 +170,7 @@ index 00000000..9b45ce88 +} diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java new file mode 100644 -index 00000000..933ecf9b +index 000000000..933ecf9bd --- /dev/null +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java @@ -0,0 +1,83 @@ @@ -259,7 +259,7 @@ index 00000000..933ecf9b +} diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java new file mode 100644 -index 00000000..a21e5ead +index 000000000..a21e5ead5 --- /dev/null +++ b/src/main/java/co/aikar/timings/Timing.java @@ -0,0 +1,83 @@ @@ -348,7 +348,7 @@ index 00000000..a21e5ead +} diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java new file mode 100644 -index 00000000..a5d13a1e +index 000000000..a5d13a1e4 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingData.java @@ -0,0 +1,122 @@ @@ -476,7 +476,7 @@ index 00000000..a5d13a1e +} diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java new file mode 100644 -index 00000000..cc0390c0 +index 000000000..cc0390c06 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHandler.java @@ -0,0 +1,227 @@ @@ -709,7 +709,7 @@ index 00000000..cc0390c0 +} diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java new file mode 100644 -index 00000000..ddaed812 +index 000000000..ddaed8127 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -0,0 +1,354 @@ @@ -1069,7 +1069,7 @@ index 00000000..ddaed812 +} diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java new file mode 100644 -index 00000000..86d5ac6b +index 000000000..86d5ac6bd --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java @@ -0,0 +1,58 @@ @@ -1133,7 +1133,7 @@ index 00000000..86d5ac6b +} diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java new file mode 100644 -index 00000000..df142a89 +index 000000000..df142a89b --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java @@ -0,0 +1,116 @@ @@ -1255,7 +1255,7 @@ index 00000000..df142a89 +} diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java new file mode 100644 -index 00000000..0b34e0d0 +index 000000000..0b34e0d01 --- /dev/null +++ b/src/main/java/co/aikar/timings/Timings.java @@ -0,0 +1,293 @@ @@ -1554,7 +1554,7 @@ index 00000000..0b34e0d0 +} diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java new file mode 100644 -index 00000000..c0d8f201 +index 000000000..c0d8f2016 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsCommand.java @@ -0,0 +1,122 @@ @@ -1682,7 +1682,7 @@ index 00000000..c0d8f201 +} diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java new file mode 100644 -index 00000000..93d5a3f9 +index 000000000..93d5a3f97 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -0,0 +1,355 @@ @@ -2043,7 +2043,7 @@ index 00000000..93d5a3f9 +} diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java new file mode 100644 -index 00000000..ef824d70 +index 000000000..ef824d701 --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsManager.java @@ -0,0 +1,188 @@ @@ -2237,7 +2237,7 @@ index 00000000..ef824d70 +} diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java new file mode 100644 -index 00000000..bf3e059f +index 000000000..bf3e059fe --- /dev/null +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java @@ -0,0 +1,75 @@ @@ -2318,7 +2318,7 @@ index 00000000..bf3e059f +} diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java new file mode 100644 -index 00000000..632c4961 +index 000000000..632c49615 --- /dev/null +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java @@ -0,0 +1,53 @@ @@ -2377,7 +2377,7 @@ index 00000000..632c4961 +} diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java new file mode 100644 -index 00000000..80155072 +index 000000000..80155072d --- /dev/null +++ b/src/main/java/co/aikar/util/Counter.java @@ -0,0 +1,38 @@ @@ -2421,7 +2421,7 @@ index 00000000..80155072 +} diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java new file mode 100644 -index 00000000..190bf059 +index 000000000..190bf0598 --- /dev/null +++ b/src/main/java/co/aikar/util/JSONUtil.java @@ -0,0 +1,140 @@ @@ -2567,7 +2567,7 @@ index 00000000..190bf059 +} diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java new file mode 100644 -index 00000000..63a899c7 +index 000000000..63a899c7d --- /dev/null +++ b/src/main/java/co/aikar/util/LoadingIntMap.java @@ -0,0 +1,76 @@ @@ -2649,7 +2649,7 @@ index 00000000..63a899c7 +} diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java new file mode 100644 -index 00000000..aedbb033 +index 000000000..aedbb0332 --- /dev/null +++ b/src/main/java/co/aikar/util/LoadingMap.java @@ -0,0 +1,368 @@ @@ -3023,7 +3023,7 @@ index 00000000..aedbb033 +} diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java new file mode 100644 -index 00000000..5989ee21 +index 000000000..5989ee212 --- /dev/null +++ b/src/main/java/co/aikar/util/MRUMapCache.java @@ -0,0 +1,111 @@ @@ -3139,7 +3139,7 @@ index 00000000..5989ee21 + } +} diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index ae21e0f9..75586936 100644 +index ae21e0f97..755869366 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -618,7 +618,6 @@ public final class Bukkit { @@ -3151,7 +3151,7 @@ index ae21e0f9..75586936 100644 /** diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index f6fb72fa..fad4e929 100644 +index f6fb72fab..fad4e9292 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1300,6 +1300,26 @@ public interface Server extends PluginMessageRecipient { @@ -3182,7 +3182,7 @@ index f6fb72fa..fad4e929 100644 * Sends the component to the player * diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 247d194f..72c5501e 100644 +index 247d194f8..72c5501e8 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -69,4 +69,12 @@ public interface UnsafeValues { @@ -3200,7 +3200,7 @@ index 247d194f..72c5501e 100644 } diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java new file mode 100644 -index 00000000..f9a00aec +index 000000000..f9a00aecc --- /dev/null +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java @@ -0,0 +1,21 @@ @@ -3226,7 +3226,7 @@ index 00000000..f9a00aec + } +} diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java -index 4bfc2146..03bdc162 100644 +index 4bfc21468..03bdc1622 100644 --- a/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java @@ -33,7 +33,8 @@ public abstract class Command { @@ -3256,7 +3256,7 @@ index 4bfc2146..03bdc162 100644 return true; } diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index d6c8938b..a6ad94ef 100644 +index d6c8938b1..a6ad94ef9 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command { @@ -3280,7 +3280,7 @@ index d6c8938b..a6ad94ef 100644 } diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java new file mode 100644 -index 00000000..ca1893e9 +index 000000000..ca1893e9f --- /dev/null +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java @@ -0,0 +1,114 @@ @@ -3399,7 +3399,7 @@ index 00000000..ca1893e9 + +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index 81e4fa57..f020cb04 100644 +index 81e4fa573..f020cb04e 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand; @@ -3456,7 +3456,7 @@ index 81e4fa57..f020cb04 100644 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java deleted file mode 100644 -index 2a145d85..00000000 +index 2a145d851..000000000 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ /dev/null @@ -1,250 +0,0 @@ @@ -3711,7 +3711,7 @@ index 2a145d85..00000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 9b0153f7..9d82a691 100644 +index 9b0153f7d..9d82a691a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1573,6 +1573,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -3727,7 +3727,7 @@ index 9b0153f7..9d82a691 100644 @NotNull diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index ec77d7be..c548911c 100644 +index ec77d7be6..c548911c4 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -358,7 +358,6 @@ public final class SimplePluginManager implements PluginManager { @@ -3787,7 +3787,7 @@ index ec77d7be..c548911c 100644 } } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index df8a5dcb..50a51394 100644 +index df8a5dcbe..50a51394f 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader { @@ -3830,7 +3830,7 @@ index df8a5dcb..50a51394 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 5830e8b9..36f542a8 100644 +index 5830e8b9b..36f542a85 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -28,7 +28,8 @@ import org.jetbrains.annotations.Nullable; @@ -3844,7 +3844,7 @@ index 5830e8b9..36f542a8 100644 private final Map> classes = new ConcurrentHashMap>(); private final PluginDescriptionFile description; diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java -index 5ca863b3..612958a3 100644 +index 5ca863b36..612958a33 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java @@ -2,6 +2,7 @@ package org.bukkit.util; @@ -3867,7 +3867,7 @@ index 5ca863b3..612958a3 100644 + +} diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java -index 44badfed..3cbe5c2b 100644 +index 44badfedc..3cbe5c2bb 100644 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java @@ -1,3 +1,26 @@ @@ -4091,5 +4091,5 @@ index 44badfed..3cbe5c2b 100644 + } -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch index 147d6072c..28146922e 100644 --- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch @@ -1,11 +1,11 @@ -From 530c3715e2a2fbf308229c1e23d704e8cb3c9c75 Mon Sep 17 00:00:00 2001 +From 8f7d065ee71a514eadcefa97e4c02e5f5e92a106 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 4d9ed678..89dcc9d4 100644 +index 9d82a691a..05b17dce7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1475,6 +1475,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -32,5 +32,5 @@ index 4d9ed678..89dcc9d4 100644 * Update the list of commands sent to the client. *
-- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0006-Add-getTPS-method.patch b/Spigot-API-Patches/0006-Add-getTPS-method.patch index 317857cfc..6efb3aaa0 100644 --- a/Spigot-API-Patches/0006-Add-getTPS-method.patch +++ b/Spigot-API-Patches/0006-Add-getTPS-method.patch @@ -1,4 +1,4 @@ -From 627f5e579e6923c6f7297db05160264f9dfa66f5 Mon Sep 17 00:00:00 2001 +From 38341660e29303cac1ddb8398e367c30309d0392 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:24:57 -0600 Subject: [PATCH] Add getTPS method @@ -48,5 +48,5 @@ index fad4e9292..f0dba56dc 100644 * Get the advancement specified by this key. * -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index 7a492d159..b8fd7a5af 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,11 +1,11 @@ -From 827f8b1953bf6c84be103bcebd58f25914563b5d Mon Sep 17 00:00:00 2001 +From fe1924a542c1c342b0c6d8e83c026b6f608216dc Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 17:50:31 -0600 Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 6b550dda..4e4445d1 100644 +index 6b550dda2..4e4445d18 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -598,4 +598,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -26,7 +26,7 @@ index 6b550dda..4e4445d1 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java -index 64f9d3fd..14cb0d77 100644 +index 64f9d3fd8..14cb0d770 100644 --- a/src/main/java/org/bukkit/entity/FallingBlock.java +++ b/src/main/java/org/bukkit/entity/FallingBlock.java @@ -54,4 +54,15 @@ public interface FallingBlock extends Entity { @@ -46,7 +46,7 @@ index 64f9d3fd..14cb0d77 100644 + } } diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java -index 5a878932..3022b4a2 100644 +index 5a8789324..3022b4a27 100644 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java @@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive { @@ -66,5 +66,5 @@ index 5a878932..3022b4a2 100644 + } } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0008-Version-Command-2.0.patch b/Spigot-API-Patches/0008-Version-Command-2.0.patch index e99d29c26..135fa2386 100644 --- a/Spigot-API-Patches/0008-Version-Command-2.0.patch +++ b/Spigot-API-Patches/0008-Version-Command-2.0.patch @@ -1,4 +1,4 @@ -From 4c7cf74d7f8635e4e964d51900bcf71e329526e9 Mon Sep 17 00:00:00 2001 +From eb32e3f7a1965a7b973da5155617dc917201793b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 27 May 2019 01:10:06 -0500 Subject: [PATCH] Version Command 2.0 @@ -6,7 +6,7 @@ Subject: [PATCH] Version Command 2.0 diff --git a/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java new file mode 100644 -index 00000000..2a265129 +index 000000000..2a2651299 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/VersionFetcher.java @@ -0,0 +1,44 @@ @@ -55,7 +55,7 @@ index 00000000..2a265129 + } +} diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index 72c5501e..c0ff133d 100644 +index 72c5501e8..c0ff133de 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -76,5 +76,12 @@ public interface UnsafeValues { @@ -72,7 +72,7 @@ index 72c5501e..c0ff133d 100644 // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index cbce5244..0486abd1 100644 +index cbce52444..0486abd19 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -1,5 +1,6 @@ @@ -176,5 +176,5 @@ index cbce5244..0486abd1 100644 try { BufferedReader reader = Resources.asCharSource( -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch index 4cd7ebfb5..a2c9714c3 100644 --- a/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch +++ b/Spigot-API-Patches/0009-Add-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From 0b59e94d724a2181a301a41753de636276177154 Mon Sep 17 00:00:00 2001 +From a986444a1c2cce777677717b45e92227b9c9e192 Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Mon, 29 Feb 2016 18:02:25 -0600 Subject: [PATCH] Add PlayerLocaleChangeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerLocaleChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java new file mode 100644 -index 00000000..29dd763a +index 000000000..29dd763a9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLocaleChangeEvent.java @@ -0,0 +1,50 @@ @@ -61,5 +61,5 @@ index 00000000..29dd763a + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index 81be9ee26..e65bd3e3f 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,11 +1,11 @@ -From 2fb8620a338c9f9a94c6af2335a7e02c85d9a98f Mon Sep 17 00:00:00 2001 +From 6db30cd492e9f5db1fcaff253fbe3a4a630af5c6 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 89dcc9d4..195c70d1 100644 +index 05b17dce7..aa64646aa 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1489,6 +1489,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -30,5 +30,5 @@ index 89dcc9d4..195c70d1 100644 /** -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch index 4fa900ce4..5ca5c5d16 100644 --- a/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch +++ b/Spigot-API-Patches/0011-Add-BeaconEffectEvent.patch @@ -1,4 +1,4 @@ -From d4c36e931e1c6a71cd65d79444a85a29e0ab4bae Mon Sep 17 00:00:00 2001 +From 2aa65d30322969ef1977dfbb7e972747b19e6398 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:09:40 -0600 Subject: [PATCH] Add BeaconEffectEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java new file mode 100644 -index 00000000..978813b9 +index 000000000..978813b94 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BeaconEffectEvent.java @@ -0,0 +1,86 @@ @@ -97,5 +97,5 @@ index 00000000..978813b9 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch index 75467ebdd..a75c6a51b 100644 --- a/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-API-Patches/0012-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From a29b417ddcedcd6a1c39aa9401f917ebd6e3c6e0 Mon Sep 17 00:00:00 2001 +From 12b172626854e7d81822f669f23778ad946326d2 Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Mon, 29 Feb 2016 18:13:58 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -7,7 +7,7 @@ For modifying a player's initial spawn location as they join the server diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java new file mode 100644 -index 00000000..8e407eff +index 000000000..8e407eff1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerInitialSpawnEvent.java @@ -0,0 +1,47 @@ @@ -59,5 +59,5 @@ index 00000000..8e407eff + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch index d6ae4c820..2b80cf1cc 100644 --- a/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch +++ b/Spigot-API-Patches/0013-Automatically-disable-plugins-that-fail-to-load.patch @@ -1,11 +1,11 @@ -From 2987610783b80ca353e9c6a6e4e463114c9d85ee Mon Sep 17 00:00:00 2001 +From 62da1f0f47b50b3fc2004268c2da2523d7d5817a Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 19:45:21 -0600 Subject: [PATCH] Automatically disable plugins that fail to load diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 50a51394..5cc37eee 100644 +index 50a51394f..5cc37eeed 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -344,6 +344,10 @@ public final class JavaPluginLoader implements PluginLoader { @@ -20,5 +20,5 @@ index 50a51394..5cc37eee 100644 // Perhaps abort here, rather than continue going, but as it stands, -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch index 6b1e7616c..88d9f232f 100644 --- a/Spigot-API-Patches/0014-Expose-server-CommandMap.patch +++ b/Spigot-API-Patches/0014-Expose-server-CommandMap.patch @@ -1,4 +1,4 @@ -From b8c5b1d14ba84e8fb7b5dc2dbd7058d46f0a359a Mon Sep 17 00:00:00 2001 +From 5d59f9c5f1e3c3a4121cfe62acf8990497c5f23f Mon Sep 17 00:00:00 2001 From: kashike Date: Mon, 29 Feb 2016 19:48:59 -0600 Subject: [PATCH] Expose server CommandMap @@ -49,5 +49,5 @@ index f0dba56dc..af21bb1aa 100644 * Get the advancement specified by this key. * -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 2585e49e7..de9a34c5f 100644 --- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From 18a481b942f840e9be0a1f0eadae88c7e336a540 Mon Sep 17 00:00:00 2001 +From fa3de2058c1cd982bb8a88560cd9899823522d6a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 19:54:32 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses @@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses Change Javadoc to be accurate diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 63e48ef3..b92304e9 100644 +index 6b951d5ad..39423f3a6 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -274,6 +274,26 @@ public final class Bukkit { @@ -37,7 +37,7 @@ index 63e48ef3..b92304e9 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 87300a5d..d35d2def 100644 +index af21bb1aa..b09d01085 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient { @@ -68,7 +68,7 @@ index 87300a5d..d35d2def 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 195c70d1..5580cdbe 100644 +index aa64646aa..0cb6d2b0a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -442,6 +442,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -111,5 +111,5 @@ index 195c70d1..5580cdbe 100644 * Forces an update of the player's entire inventory. * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch index 2b183bb7d..b93a2e3a5 100644 --- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From 6b39c2b09405e827d4d7d2c774b54651b39efa89 Mon Sep 17 00:00:00 2001 +From f538375cbfe190146ccf1624387062161c0a1e44 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 29 Feb 2016 20:02:40 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java new file mode 100644 -index 00000000..4fe18540 +index 000000000..4fe18540f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Title.java @@ -0,0 +1,373 @@ @@ -384,7 +384,7 @@ index 00000000..4fe18540 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5580cdbe..2017a51d 100644 +index 0cb6d2b0a..f0f02c326 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1,6 +1,7 @@ @@ -513,5 +513,5 @@ index 5580cdbe..2017a51d 100644 /** -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch index 04ed6cc6a..facac30e1 100644 --- a/Spigot-API-Patches/0017-Add-exception-reporting-event.patch +++ b/Spigot-API-Patches/0017-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From d828cc996beb79f80dc5fff118416fe7d87ee90a Mon Sep 17 00:00:00 2001 +From 4510c1ac6e1ad5b0e111a39d9ae63c37bf751b46 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:24:35 -0600 Subject: [PATCH] Add exception reporting event @@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java new file mode 100644 -index 00000000..2f573299 +index 000000000..2f573299a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java @@ -0,0 +1,43 @@ @@ -55,7 +55,7 @@ index 00000000..2f573299 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java new file mode 100644 -index 00000000..6fb39af0 +index 000000000..6fb39af04 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java @@ -0,0 +1,64 @@ @@ -125,7 +125,7 @@ index 00000000..6fb39af0 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java new file mode 100644 -index 00000000..410b2413 +index 000000000..410b24139 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java @@ -0,0 +1,52 @@ @@ -183,7 +183,7 @@ index 00000000..410b2413 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java new file mode 100644 -index 00000000..c06ea394 +index 000000000..c06ea3942 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java @@ -0,0 +1,23 @@ @@ -212,7 +212,7 @@ index 00000000..c06ea394 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java new file mode 100644 -index 00000000..e762ed0d +index 000000000..e762ed0db --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java @@ -0,0 +1,35 @@ @@ -253,7 +253,7 @@ index 00000000..e762ed0d +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java new file mode 100644 -index 00000000..f016ba3b +index 000000000..f016ba3b1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java @@ -0,0 +1,20 @@ @@ -280,7 +280,7 @@ index 00000000..f016ba3b \ No newline at end of file diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java new file mode 100644 -index 00000000..6defac28 +index 000000000..6defac287 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java @@ -0,0 +1,38 @@ @@ -324,7 +324,7 @@ index 00000000..6defac28 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java new file mode 100644 -index 00000000..89e13252 +index 000000000..89e132525 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java @@ -0,0 +1,64 @@ @@ -394,7 +394,7 @@ index 00000000..89e13252 +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java new file mode 100644 -index 00000000..2d0b2d4a +index 000000000..2d0b2d4a9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java @@ -0,0 +1,37 @@ @@ -437,7 +437,7 @@ index 00000000..2d0b2d4a +} diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java new file mode 100644 -index 00000000..5582999f +index 000000000..5582999fe --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java @@ -0,0 +1,22 @@ @@ -464,7 +464,7 @@ index 00000000..5582999f + } +} diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java -index f020cb04..adfc7aae 100644 +index f020cb04e..adfc7aae2 100644 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -8,6 +8,10 @@ import java.util.HashMap; @@ -506,7 +506,7 @@ index f020cb04..adfc7aae 100644 } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index c548911c..9a5fe8ca 100644 +index c548911c4..9a5fe8ca4 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -23,6 +23,10 @@ import java.util.WeakHashMap; @@ -603,5 +603,5 @@ index c548911c..9a5fe8ca 100644 } } -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch index f83dafa63..8846c1164 100644 --- a/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch +++ b/Spigot-API-Patches/0018-Fix-ServerListPingEvent-flagging-as-Async.patch @@ -1,4 +1,4 @@ -From 709bd509e61a7f25b64fe128b2ae42a5bef797d0 Mon Sep 17 00:00:00 2001 +From d55149dcb67c6bfd3e31d8fbc98345e02abf0175 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 20:26:39 -0600 Subject: [PATCH] Fix ServerListPingEvent flagging as Async @@ -6,7 +6,7 @@ Subject: [PATCH] Fix ServerListPingEvent flagging as Async This event can sometimes fire Async, set the proper boolean diff --git a/src/main/java/org/bukkit/event/server/ServerEvent.java b/src/main/java/org/bukkit/event/server/ServerEvent.java -index 46b11901..05167fb3 100644 +index 46b119017..05167fb34 100644 --- a/src/main/java/org/bukkit/event/server/ServerEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerEvent.java @@ -1,5 +1,6 @@ @@ -26,5 +26,5 @@ index 46b11901..05167fb3 100644 public ServerEvent(boolean isAsync) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch index 1076002dc..139fabb9d 100644 --- a/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch +++ b/Spigot-API-Patches/0019-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch @@ -1,11 +1,11 @@ -From 049f07e456fd74dff34a47eef4ffaa10706c8dbf Mon Sep 17 00:00:00 2001 +From 8ae5dc71f1abb6e3a32e468bde32e1783b510380 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 13:05:59 -0800 Subject: [PATCH] Add BaseComponent sendMessage methods to CommandSender diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java -index a9020ecc..d3b3a8bf 100644 +index a9020ecc7..d3b3a8bf9 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -61,4 +61,30 @@ public interface CommandSender extends Permissible { @@ -40,5 +40,5 @@ index a9020ecc..d3b3a8bf 100644 + // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch index be121058f..a1cebde7b 100644 --- a/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-API-Patches/0020-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,4 +1,4 @@ -From ee3d57933edf4cda5071671e3780ad40d12e9157 Mon Sep 17 00:00:00 2001 +From 18d38fdbc6aa79a3105ee7197bfc386a6a46db71 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:47:27 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities @@ -29,5 +29,5 @@ index 203d135f1..52541e496 100644 + // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch index 5600b7e42..ee0ab24d4 100644 --- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From f2621f0d4acb9489a76dea81ddf20287d8351561 Mon Sep 17 00:00:00 2001 +From d6d84e5ecb5b36e7c4ca106801d0926b72f15244 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f0f02c32..943e6a64 100644 +index f0f02c326..943e6a64e 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1225,7 +1225,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -82,7 +82,7 @@ index f0f02c32..943e6a64 100644 public class Spigot extends Entity.Spigot { diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java -index b9819565..4c2102a1 100644 +index b98195650..4c2102a11 100644 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java @@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull; @@ -119,5 +119,5 @@ index b9819565..4c2102a1 100644 * Gets the status of this pack. * -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index fb089591a..5438a662e 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From 756aea639de4f25d902ce0c2fc794d3d4d1265d3 Mon Sep 17 00:00:00 2001 +From 070befa47c5a599596a610780baaa6cfff261237 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index a540adef..5c25ff12 100644 +index 3cfbff14b..3712b70bc 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,17 @@ @@ -29,7 +29,7 @@ index a540adef..5c25ff12 100644 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 -index 00000000..5b28e9b1 +index 000000000..5b28e9b1d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java @@ -0,0 +1,42 @@ @@ -77,7 +77,7 @@ index 00000000..5b28e9b1 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java new file mode 100644 -index 00000000..c8367242 +index 000000000..c83672427 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java @@ -0,0 +1,43 @@ @@ -126,7 +126,7 @@ index 00000000..c8367242 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java new file mode 100644 -index 00000000..b6e7d8ee +index 000000000..b6e7d8ee8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java @@ -0,0 +1,47 @@ @@ -179,7 +179,7 @@ index 00000000..b6e7d8ee +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java new file mode 100644 -index 00000000..beed9e6e +index 000000000..beed9e6e0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java @@ -0,0 +1,35 @@ @@ -220,7 +220,7 @@ index 00000000..beed9e6e +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java new file mode 100644 -index 00000000..ac99477e +index 000000000..ac99477e9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java @@ -0,0 +1,66 @@ @@ -292,7 +292,7 @@ index 00000000..ac99477e +} diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java new file mode 100644 -index 00000000..72e48e8e +index 000000000..72e48e8ef --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java @@ -0,0 +1,35 @@ @@ -332,7 +332,7 @@ index 00000000..72e48e8e + } +} diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java -index a850f078..9026e108 100644 +index a850f0780..9026e108c 100644 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java @@ -5,9 +5,75 @@ import org.bukkit.event.EventException; @@ -412,7 +412,7 @@ index a850f078..9026e108 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 5cc37eee..e72cbde4 100644 +index 5cc37eeed..e72cbde4b 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -300,21 +300,7 @@ public final class JavaPluginLoader implements PluginLoader { @@ -439,5 +439,5 @@ index 5cc37eee..e72cbde4 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch index 7a3936ed2..b022f63cb 100644 --- a/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch +++ b/Spigot-API-Patches/0023-Add-a-call-helper-to-Event.patch @@ -1,4 +1,4 @@ -From ac25178018130d824244228559daeb62c031b5c1 Mon Sep 17 00:00:00 2001 +From da27772114ec79eb988549a347bc9b29c2e5e1da Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 May 2013 20:36:58 -0400 Subject: [PATCH] Add a call helper to Event @@ -6,7 +6,7 @@ Subject: [PATCH] Add a call helper to Event Reduces diff in Server patches diff --git a/src/main/java/org/bukkit/event/Event.java b/src/main/java/org/bukkit/event/Event.java -index 18d0636b..8ec56cd6 100644 +index 18d0636b7..8ec56cd6b 100644 --- a/src/main/java/org/bukkit/event/Event.java +++ b/src/main/java/org/bukkit/event/Event.java @@ -35,6 +35,22 @@ public abstract class Event { @@ -33,5 +33,5 @@ index 18d0636b..8ec56cd6 100644 * Convenience method for providing a user-friendly identifier. By * default, it is the event's class's {@linkplain Class#getSimpleName() -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch index 08259741c..0db5baff3 100644 --- a/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch +++ b/Spigot-API-Patches/0024-Add-sender-name-to-commands.yml-replacement.patch @@ -1,4 +1,4 @@ -From cf697b427b7974f18fcd07174c664d239843ff1f Mon Sep 17 00:00:00 2001 +From c0bad2b238c1d7e452039c10b683dc3075376a4c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 22 Jul 2015 18:50:41 -0400 Subject: [PATCH] Add sender name to commands.yml replacement @@ -7,7 +7,7 @@ This allows you to use $sender in commands.yml definitions to make commands that auto target self. diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java -index a6ad94ef..9d4f553c 100644 +index a6ad94ef9..9d4f553c0 100644 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -1,6 +1,9 @@ @@ -42,5 +42,5 @@ index a6ad94ef..9d4f553c 100644 while (index != -1) { int start = index; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch index 935c4d9c6..07e64358f 100644 --- a/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch +++ b/Spigot-API-Patches/0025-Add-command-to-reload-permissions.yml-and-require-co.patch @@ -1,4 +1,4 @@ -From f00c5126e2cc85c6f326663998ffe6c310531c1f Mon Sep 17 00:00:00 2001 +From f0b316740a9ee295791f79099821d953aa2d11c4 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:28:07 -0400 Subject: [PATCH] Add command to reload permissions.yml and require confirm to @@ -6,7 +6,7 @@ Subject: [PATCH] Add command to reload permissions.yml and require confirm to diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java -index 39423f3a..423fecf5 100644 +index 39423f3a6..423fecf54 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -1574,6 +1574,13 @@ public final class Bukkit { @@ -24,7 +24,7 @@ index 39423f3a..423fecf5 100644 @NotNull diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index b09d0108..38d7da73 100644 +index b09d01085..38d7da737 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -1388,4 +1388,6 @@ public interface Server extends PluginMessageRecipient { @@ -35,7 +35,7 @@ index b09d0108..38d7da73 100644 + void reloadPermissions(); // Paper } diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java -index 50cc311b..c62da413 100644 +index 50cc311be..c62da4131 100644 --- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java +++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java @@ -13,15 +13,35 @@ public class ReloadCommand extends BukkitCommand { @@ -85,7 +85,7 @@ index 50cc311b..c62da413 100644 } } diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 9a5fe8ca..8ddaf9c2 100644 +index 9a5fe8ca4..8ddaf9c2e 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -894,4 +894,13 @@ public final class SimplePluginManager implements PluginManager { @@ -103,5 +103,5 @@ index 9a5fe8ca..8ddaf9c2 100644 + } -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch index c141fd3ce..9cb96bccd 100644 --- a/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch +++ b/Spigot-API-Patches/0026-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From 0f2180289eb27d8af3ad7ec6132eca352efc7ccc Mon Sep 17 00:00:00 2001 +From e9241513c3d597d3dd268f27a6900f94f094c092 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:05:21 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java -index c2793f3e..373f4b5b 100644 +index c2793f3ef..373f4b5b5 100644 --- a/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerItemConsumeEvent.java @@ -22,6 +22,7 @@ public class PlayerItemConsumeEvent extends PlayerEvent implements Cancellable { @@ -47,5 +47,5 @@ index c2793f3e..373f4b5b 100644 public boolean isCancelled() { return this.isCancelled; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch index 4fdf34b67..fd6418040 100644 --- a/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch +++ b/Spigot-API-Patches/0027-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From 1ffda222e9676022f70fdf8c7735987051e5ff7c Mon Sep 17 00:00:00 2001 +From 05ae91f7ee31917b7918702d1ebbf81b19243d03 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:44:49 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java -index 88ce9dc6..96916ec9 100644 +index 88ce9dc6b..96916ec95 100644 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java @@ -215,4 +215,23 @@ public interface PlayerInventory extends Inventory { @@ -33,5 +33,5 @@ index 88ce9dc6..96916ec9 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch index 25b79860c..14a9c0b58 100644 --- a/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-API-Patches/0028-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,4 +1,4 @@ -From dec02429dc56f84c69c327df0f87b1919f6579a2 Mon Sep 17 00:00:00 2001 +From 7a1354a251ad7d78f0a7f56d94d051e30fcc9a9a Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:26:34 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events @@ -6,7 +6,7 @@ Subject: [PATCH] Entity AddTo/RemoveFrom World Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java new file mode 100644 -index 00000000..07660202 +index 000000000..07660202e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityAddToWorldEvent.java @@ -0,0 +1,32 @@ @@ -44,7 +44,7 @@ index 00000000..07660202 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java new file mode 100644 -index 00000000..e5dbbd66 +index 000000000..e5dbbd660 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityRemoveFromWorldEvent.java @@ -0,0 +1,29 @@ @@ -78,5 +78,5 @@ index 00000000..e5dbbd66 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0029-EntityPathfindEvent.patch b/Spigot-API-Patches/0029-EntityPathfindEvent.patch index c84d7dcf2..8b440200e 100644 --- a/Spigot-API-Patches/0029-EntityPathfindEvent.patch +++ b/Spigot-API-Patches/0029-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From f785fe7ad6eead77bc5103ec2702f4993373e8a9 Mon Sep 17 00:00:00 2001 +From 2ddd503b8812a66fa419df04733b2924fb794a0b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:15:34 -0400 Subject: [PATCH] EntityPathfindEvent @@ -7,7 +7,7 @@ Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java new file mode 100644 -index 00000000..63e46b2f +index 000000000..63e46b2fb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityPathfindEvent.java @@ -0,0 +1,82 @@ @@ -94,5 +94,5 @@ index 00000000..63e46b2f + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch index ec224ea9a..e1e449a2a 100644 --- a/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch +++ b/Spigot-API-Patches/0030-Reduce-thread-synchronization-in-MetadataStoreBase.patch @@ -1,4 +1,4 @@ -From afee8fb7282413c3d47adc3b5c697f1eb2cf1036 Mon Sep 17 00:00:00 2001 +From dfbeeeb5128994e0561f8b803688603e2e0ea8e3 Mon Sep 17 00:00:00 2001 From: crast Date: Sat, 1 Jun 2013 13:52:30 -0600 Subject: [PATCH] Reduce thread synchronization in MetadataStoreBase @@ -8,7 +8,7 @@ limited synchronized portions to allow much higher concurrency in MetadataStore as well as far less locking, especially on reads diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index baf85022..d363d517 100644 +index baf850226..d363d517c 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -12,7 +12,7 @@ import org.bukkit.plugin.Plugin; @@ -89,5 +89,5 @@ index baf85022..d363d517 100644 for (Map values : metadataMap.values()) { if (values.containsKey(owningPlugin)) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch index a47f90eae..c7e0dd5e0 100644 --- a/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch +++ b/Spigot-API-Patches/0031-Add-MetadataStoreBase.removeAll-Plugin.patch @@ -1,4 +1,4 @@ -From 6ddb428ccd0bcf637ffbd9542cc78facdd1b3e39 Mon Sep 17 00:00:00 2001 +From 091dd579f3b4f7cc79e53b67278eb3fb6a1e6230 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 16 Jul 2013 21:26:50 -0400 Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) @@ -6,7 +6,7 @@ Subject: [PATCH] Add MetadataStoreBase.removeAll(Plugin) So that on reload, metadata will be cleared diff --git a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java -index d363d517..abbe545a 100644 +index d363d517c..abbe545af 100644 --- a/src/main/java/org/bukkit/metadata/MetadataStoreBase.java +++ b/src/main/java/org/bukkit/metadata/MetadataStoreBase.java @@ -4,6 +4,7 @@ import java.util.ArrayList; @@ -45,5 +45,5 @@ index d363d517..abbe545a 100644 * Creates a unique name for the object receiving metadata by combining * unique data from the subject with a metadataKey. -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch index 8b9807a2e..0268745f9 100644 --- a/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-API-Patches/0032-Add-PlayerUseUnknownEntityEvent.patch @@ -1,4 +1,4 @@ -From 90a091641aad273ceec6d85f70bcc72fa451f316 Mon Sep 17 00:00:00 2001 +From 8ac6eed2974264699f48da9eafb488bc5f9504ab Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:08:36 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java new file mode 100644 -index 00000000..09cfdf48 +index 000000000..09cfdf48e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerUseUnknownEntityEvent.java @@ -0,0 +1,46 @@ @@ -57,5 +57,5 @@ index 00000000..09cfdf48 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch index 8dcdbdc6e..81d43b266 100644 --- a/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch +++ b/Spigot-API-Patches/0033-Add-handshake-event-to-allow-plugins-to-handle-clien.patch @@ -1,4 +1,4 @@ -From ca75c6d3c7ec62bcb6c2022bd8a2678813c50104 Mon Sep 17 00:00:00 2001 +From f99266e0f58c1e678b0947bb7f8e043464e83591 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 13 Apr 2016 20:20:18 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -7,7 +7,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java new file mode 100644 -index 00000000..f0bb4e31 +index 000000000..f0bb4e31c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerHandshakeEvent.java @@ -0,0 +1,222 @@ @@ -234,5 +234,5 @@ index 00000000..f0bb4e31 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch index d0d4b86c1..849f99943 100644 --- a/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch +++ b/Spigot-API-Patches/0034-Arrow-pickup-rule-API.patch @@ -1,11 +1,11 @@ -From 9083c64a839306592c6048a3eaf2d47dbe8dd590 Mon Sep 17 00:00:00 2001 +From 9b6b76c82b9ea8b2ac5a9994b7404972c653eb73 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 4 Mar 2016 03:13:18 -0500 Subject: [PATCH] Arrow pickup rule API diff --git a/src/main/java/org/bukkit/entity/AbstractArrow.java b/src/main/java/org/bukkit/entity/AbstractArrow.java -index 88cebc00..b2bf62a5 100644 +index 88cebc004..b2bf62a50 100644 --- a/src/main/java/org/bukkit/entity/AbstractArrow.java +++ b/src/main/java/org/bukkit/entity/AbstractArrow.java @@ -127,4 +127,38 @@ public interface AbstractArrow extends Projectile { @@ -48,5 +48,5 @@ index 88cebc00..b2bf62a5 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch index 5799800f1..b05cfef44 100644 --- a/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-API-Patches/0035-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,11 +1,11 @@ -From 1e799e05cca516707285471789f33d58cba384b7 Mon Sep 17 00:00:00 2001 +From 9ab9b353c9a76455567a474ce06c2916d7789d75 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API diff --git a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java -index 8feb6698..d51d2ec1 100644 +index 8feb6698f..d51d2ec1d 100644 --- a/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityRegainHealthEvent.java @@ -13,12 +13,31 @@ public class EntityRegainHealthEvent extends EntityEvent implements Cancellable @@ -41,5 +41,5 @@ index 8feb6698..d51d2ec1 100644 /** * Gets the amount of regained health -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0036-LootTable-API.patch b/Spigot-API-Patches/0036-LootTable-API.patch index c4c9e265f..0503ee742 100644 --- a/Spigot-API-Patches/0036-LootTable-API.patch +++ b/Spigot-API-Patches/0036-LootTable-API.patch @@ -1,4 +1,4 @@ -From adbfe47db1430abf4f538b0dd7bc4aaebcdbff9a Mon Sep 17 00:00:00 2001 +From f8f1bbee15cabfe54253a4a7e50ee687ebe3694c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 15:19:49 -0400 Subject: [PATCH] LootTable API @@ -12,7 +12,7 @@ Provides methods to determine players looted state for an object diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java new file mode 100644 -index 00000000..92d7b853 +index 000000000..92d7b853a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableBlockInventory.java @@ -0,0 +1,17 @@ @@ -35,7 +35,7 @@ index 00000000..92d7b853 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java new file mode 100644 -index 00000000..b387894f +index 000000000..b387894fe --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableEntityInventory.java @@ -0,0 +1,17 @@ @@ -58,7 +58,7 @@ index 00000000..b387894f +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java new file mode 100644 -index 00000000..97815eeb +index 000000000..97815eeb2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventory.java @@ -0,0 +1,116 @@ @@ -180,7 +180,7 @@ index 00000000..97815eeb +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java new file mode 100644 -index 00000000..fd184f13 +index 000000000..fd184f13f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/LootableInventoryReplenishEvent.java @@ -0,0 +1,45 @@ @@ -230,7 +230,7 @@ index 00000000..fd184f13 + } +} diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java -index c67d7110..a569c7b6 100644 +index c67d71101..a569c7b63 100644 --- a/src/main/java/org/bukkit/block/Chest.java +++ b/src/main/java/org/bukkit/block/Chest.java @@ -1,5 +1,7 @@ @@ -251,7 +251,7 @@ index c67d7110..a569c7b6 100644 /** * Gets the inventory of the chest block represented by this block state. diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java -index 74cd194c..07af1a3f 100644 +index 74cd194c9..07af1a3f0 100644 --- a/src/main/java/org/bukkit/block/Dispenser.java +++ b/src/main/java/org/bukkit/block/Dispenser.java @@ -1,5 +1,6 @@ @@ -271,7 +271,7 @@ index 74cd194c..07af1a3f 100644 /** * Gets the BlockProjectileSource object for the dispenser. diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java -index 424392fb..c7620232 100644 +index 424392fb5..c76202321 100644 --- a/src/main/java/org/bukkit/block/Dropper.java +++ b/src/main/java/org/bukkit/block/Dropper.java @@ -1,11 +1,12 @@ @@ -289,7 +289,7 @@ index 424392fb..c7620232 100644 /** * Tries to drop a randomly selected item from the dropper's inventory, diff --git a/src/main/java/org/bukkit/block/Hopper.java b/src/main/java/org/bukkit/block/Hopper.java -index 58e49309..7ade312f 100644 +index 58e493099..7ade312f1 100644 --- a/src/main/java/org/bukkit/block/Hopper.java +++ b/src/main/java/org/bukkit/block/Hopper.java @@ -1,8 +1,9 @@ @@ -304,7 +304,7 @@ index 58e49309..7ade312f 100644 -public interface Hopper extends Container, Lootable { } +public interface Hopper extends Container, LootableBlockInventory { } // Paper diff --git a/src/main/java/org/bukkit/block/ShulkerBox.java b/src/main/java/org/bukkit/block/ShulkerBox.java -index 938f9aea..42f5b4ea 100644 +index 938f9aead..42f5b4ea3 100644 --- a/src/main/java/org/bukkit/block/ShulkerBox.java +++ b/src/main/java/org/bukkit/block/ShulkerBox.java @@ -1,5 +1,6 @@ @@ -324,7 +324,7 @@ index 938f9aea..42f5b4ea 100644 /** * Get the {@link DyeColor} corresponding to this ShulkerBox diff --git a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java -index 937b99f8..db69687a 100644 +index 937b99f87..db69687a7 100644 --- a/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/HopperMinecart.java @@ -1,5 +1,6 @@ @@ -344,7 +344,7 @@ index 937b99f8..db69687a 100644 /** * Checks whether or not this Minecart will pick up diff --git a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java -index 9ea403e6..238d118f 100644 +index 9ea403e6f..238d118f7 100644 --- a/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/StorageMinecart.java @@ -1,5 +1,6 @@ @@ -362,7 +362,7 @@ index 9ea403e6..238d118f 100644 +public interface StorageMinecart extends Minecart, InventoryHolder, LootableEntityInventory { // Paper } diff --git a/src/main/java/org/bukkit/loot/Lootable.java b/src/main/java/org/bukkit/loot/Lootable.java -index 24a3d989..901db852 100644 +index 24a3d989d..901db8524 100644 --- a/src/main/java/org/bukkit/loot/Lootable.java +++ b/src/main/java/org/bukkit/loot/Lootable.java @@ -36,6 +36,34 @@ public interface Lootable { @@ -401,5 +401,5 @@ index 24a3d989..901db852 100644 * Set the seed used when this Loot Table generates loot. * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch index 4ba052ac6..de25fa52b 100644 --- a/Spigot-API-Patches/0037-Add-EntityZapEvent.patch +++ b/Spigot-API-Patches/0037-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 8c1752d4801781454495bf4d0eb5554cc270538f Mon Sep 17 00:00:00 2001 +From 3e509ef8019f3efe28e265dbbbdae31c3f23d235 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:34 -0700 Subject: [PATCH] Add EntityZapEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java new file mode 100644 -index 00000000..3b725a48 +index 000000000..3b725a489 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityZapEvent.java @@ -0,0 +1,65 @@ @@ -76,7 +76,7 @@ index 00000000..3b725a48 + } +} diff --git a/src/main/java/org/bukkit/event/entity/PigZapEvent.java b/src/main/java/org/bukkit/event/entity/PigZapEvent.java -index 0e0ed93b..d3949edf 100644 +index 0e0ed93b5..d3949edfc 100644 --- a/src/main/java/org/bukkit/event/entity/PigZapEvent.java +++ b/src/main/java/org/bukkit/event/entity/PigZapEvent.java @@ -2,6 +2,7 @@ package org.bukkit.event.entity; @@ -122,5 +122,5 @@ index 0e0ed93b..d3949edf 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0038-Misc-Utils.patch b/Spigot-API-Patches/0038-Misc-Utils.patch index 7ac10f647..5cc9da3fe 100644 --- a/Spigot-API-Patches/0038-Misc-Utils.patch +++ b/Spigot-API-Patches/0038-Misc-Utils.patch @@ -1,4 +1,4 @@ -From 952aa5667bd48ddb71a0b357b7ae97622d964320 Mon Sep 17 00:00:00 2001 +From 559959380fa34db1acd3b167e05bafb17b89e8f4 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 12:53:43 -0500 Subject: [PATCH] Misc Utils @@ -6,7 +6,7 @@ Subject: [PATCH] Misc Utils diff --git a/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java new file mode 100644 -index 00000000..5bb677ce +index 000000000..5bb677ce5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/CachedSizeConcurrentLinkedQueue.java @@ -0,0 +1,34 @@ @@ -45,5 +45,5 @@ index 00000000..5bb677ce + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch index 05e536824..153132ddb 100644 --- a/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-API-Patches/0039-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From b603b131d3e8a465c227a072486f9121832fa5f0 Mon Sep 17 00:00:00 2001 +From c841a774495970964d668cc65c0715e84f43e951 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:16:39 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -99,5 +99,5 @@ index c62da4131..af8ab73fe 100644 confirmed = true; } else { -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch index 8f6d6c09e..befc42744 100644 --- a/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-API-Patches/0040-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 64007b93caf3708274585172c66edb0e11d04b24 Mon Sep 17 00:00:00 2001 +From d021eefa33645c6ad7cb1bf140a9f7602ccc6704 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:47:08 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java -index c99c9281..7c340f53 100644 +index c99c9281e..7c340f539 100644 --- a/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerExpChangeEvent.java @@ -1,21 +1,43 @@ @@ -53,5 +53,5 @@ index c99c9281..7c340f53 100644 * Get the amount of experience the player will receive * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch index 95732c846..efca70a3c 100644 --- a/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch +++ b/Spigot-API-Patches/0041-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From a7ee9a6f5fc22809be5c20ec306953af7b49c522 Mon Sep 17 00:00:00 2001 +From 09ab884e22c0b5d6b658c1fb2b9f98b711cd2b7d Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add ProjectileCollideEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java new file mode 100644 -index 00000000..45366389 +index 000000000..453663893 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java @@ -0,0 +1,67 @@ @@ -78,5 +78,5 @@ index 00000000..45366389 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch index ff6b5d2c2..51cf791ec 100644 --- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch @@ -1,11 +1,11 @@ -From 6e5d036ae3b3f7115a03dba6e5cb6350a87c49d3 Mon Sep 17 00:00:00 2001 +From 20f3a9e73351f0d7b3366eab311eb467d1247a25 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 943e6a64..58a6795d 100644 +index 943e6a64e..58a6795df 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -444,6 +444,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -72,5 +72,5 @@ index 943e6a64..58a6795d 100644 throw new UnsupportedOperationException("Not supported yet."); } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch index db475846e..dfa096430 100644 --- a/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-API-Patches/0043-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From 513f6bcf5563fb3d9fd1401cd1a62f4f24c33a2c Mon Sep 17 00:00:00 2001 +From 16cad21ec53a8899e2579841f235ee51c62052ce Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index beeba55d..6a854d7c 100644 +index beeba55d5..6a854d7cf 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -291,4 +291,22 @@ public interface ArmorStand extends LivingEntity { @@ -32,5 +32,5 @@ index beeba55d..6a854d7c 100644 + // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0044-IllegalPacketEvent.patch b/Spigot-API-Patches/0044-IllegalPacketEvent.patch index fa3300c61..c4e861279 100644 --- a/Spigot-API-Patches/0044-IllegalPacketEvent.patch +++ b/Spigot-API-Patches/0044-IllegalPacketEvent.patch @@ -1,4 +1,4 @@ -From e9e0b9f25fba2df081017bb48db56bfa40e364f6 Mon Sep 17 00:00:00 2001 +From 95814d0fc19ff644b9d7c04a93a16ec96b3c5b6a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 4 Dec 2016 01:19:14 -0500 Subject: [PATCH] IllegalPacketEvent @@ -9,7 +9,7 @@ Lets plugins change the kick message and if it should kick or not. diff --git a/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java new file mode 100644 -index 00000000..37a17f0b +index 000000000..37a17f0bb --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/IllegalPacketEvent.java @@ -0,0 +1,70 @@ @@ -84,5 +84,5 @@ index 00000000..37a17f0b + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0045-Fireworks-API-s.patch b/Spigot-API-Patches/0045-Fireworks-API-s.patch index eec95563d..d0389bcd7 100644 --- a/Spigot-API-Patches/0045-Fireworks-API-s.patch +++ b/Spigot-API-Patches/0045-Fireworks-API-s.patch @@ -1,4 +1,4 @@ -From 5350778e510bb69d70efd8d83fb58caf1cdf8fd9 Mon Sep 17 00:00:00 2001 +From 98d25e5120b1967d9983edeb20d952bb16104c87 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 01:18:55 -0500 Subject: [PATCH] Fireworks API's @@ -7,7 +7,7 @@ Get the Entity being boosted Get the firework launcher diff --git a/src/main/java/org/bukkit/entity/Firework.java b/src/main/java/org/bukkit/entity/Firework.java -index f844d5aa..e8c04c13 100644 +index f844d5aa9..e8c04c138 100644 --- a/src/main/java/org/bukkit/entity/Firework.java +++ b/src/main/java/org/bukkit/entity/Firework.java @@ -3,6 +3,9 @@ package org.bukkit.entity; @@ -37,5 +37,5 @@ index f844d5aa..e8c04c13 100644 + // Paper end } -- -2.14.1.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch index b823095ce..f5e8dfa85 100644 --- a/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0046-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From 3bcf7bff9c9f71c3122f392b2c723f7a046c43bb Mon Sep 17 00:00:00 2001 +From 0e0e72ef0da87fb3a9de37e049181261b1563ade Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 20:29:33 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -7,7 +7,7 @@ Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java new file mode 100644 -index 00000000..b64ab6ee +index 000000000..b64ab6eec --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerTeleportEndGatewayEvent.java @@ -0,0 +1,29 @@ @@ -41,5 +41,5 @@ index 00000000..b64ab6ee + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch index 3233cd5ce..8a0347ca2 100644 --- a/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-API-Patches/0047-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From fe0318389beb2088daeccc0b47ab87418d56bdec Mon Sep 17 00:00:00 2001 +From df2cbfd4b45e1d99861b99775717e8bb65521555 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:23:03 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size() which creates copy of the collections. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index cd8a0957..808c3b4a 100644 +index cd8a09576..808c3b4a4 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -40,6 +40,33 @@ import org.jetbrains.annotations.Nullable; @@ -45,5 +45,5 @@ index cd8a0957..808c3b4a 100644 * Gets the {@link Block} at the given coordinates * -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 043e6e560..5f77a2ec7 100644 --- a/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-API-Patches/0048-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 55be87884e78cf987c5f047e44e15d509fcc1fc5 Mon Sep 17 00:00:00 2001 +From a4e43288167984c868f8d3c62aab633fb1f8ae78 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:28:32 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -8,7 +8,7 @@ Adds lots of information about why this orb exists. Replaces isFromBottle() with logic that persists entity reloads too. diff --git a/src/main/java/org/bukkit/entity/ExperienceOrb.java b/src/main/java/org/bukkit/entity/ExperienceOrb.java -index c286edfd..dec70bbf 100644 +index c286edfd8..dec70bbfa 100644 --- a/src/main/java/org/bukkit/entity/ExperienceOrb.java +++ b/src/main/java/org/bukkit/entity/ExperienceOrb.java @@ -1,5 +1,8 @@ @@ -121,5 +121,5 @@ index c286edfd..dec70bbf 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch index 2ce8ce24d..0116efa0f 100644 --- a/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch +++ b/Spigot-API-Patches/0049-Expose-WorldBorder-isInBounds-Location-check.patch @@ -1,11 +1,11 @@ -From 0514c1bc80be7336de8681a0bd9e594894c51a1e Mon Sep 17 00:00:00 2001 +From 8eb2d55c1b5aa53889b24064e59c13684dc9d0e9 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 21 Jan 2017 17:03:10 -0600 Subject: [PATCH] Expose WorldBorder#isInBounds(Location) check diff --git a/src/main/java/org/bukkit/WorldBorder.java b/src/main/java/org/bukkit/WorldBorder.java -index 7e8f5649..afb7b136 100644 +index 7e8f5649c..afb7b136b 100644 --- a/src/main/java/org/bukkit/WorldBorder.java +++ b/src/main/java/org/bukkit/WorldBorder.java @@ -117,4 +117,18 @@ public interface WorldBorder { @@ -28,5 +28,5 @@ index 7e8f5649..afb7b136 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch index 99e93c1ab..7cfc7f7ce 100644 --- a/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-API-Patches/0050-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 955026063b2174e79c657fa323591c79101d1cf8 Mon Sep 17 00:00:00 2001 +From 57dfe41e0fe5f7f191d659a8f17525d507024ec0 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:24 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -58,5 +58,5 @@ index 7f153000e..1e126487d 100644 } return completions; -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch index 3714fcf7a..81aacee05 100644 --- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch @@ -1,4 +1,4 @@ -From 6f09bf71699cd554a8891cb9f0d72f4a290dcc9f Mon Sep 17 00:00:00 2001 +From 2c5ef53e6bd05c58c28fd9322634a48da97c292a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 10 Jun 2017 16:59:40 -0500 Subject: [PATCH] Fix upstream javadoc warnings and errors @@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 808c3b4a..3b027f67 100644 +index 808c3b4a4..3b027f67c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2009,6 +2009,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -74,7 +74,7 @@ index 808c3b4a..3b027f67 100644 public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force); diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java -index c2096b53..bca9d365 100644 +index c2096b534..bca9d3659 100644 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java @@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity { @@ -86,7 +86,7 @@ index c2096b53..bca9d365 100644 void setParticle(@NotNull Particle particle, @Nullable T data); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 58a6795d..f10ef7ae 100644 +index 58a6795df..f10ef7ae7 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -459,7 +459,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -179,7 +179,7 @@ index 58a6795d..f10ef7ae 100644 public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data); diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java -index 1b2267f4..1a58734d 100644 +index 1b2267f4e..1a58734d9 100644 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java @@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable { @@ -192,5 +192,5 @@ index 1b2267f4..1a58734d 100644 return to; } -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0052-Item-canEntityPickup.patch b/Spigot-API-Patches/0052-Item-canEntityPickup.patch index 36e30d116..9fc0e1e68 100644 --- a/Spigot-API-Patches/0052-Item-canEntityPickup.patch +++ b/Spigot-API-Patches/0052-Item-canEntityPickup.patch @@ -1,11 +1,11 @@ -From d71df227a9f6de7d4a3fd1f0345b8f561c3c3bb1 Mon Sep 17 00:00:00 2001 +From e577358b94c9b069218f40f2eea0b5156b524549 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:08 -0500 Subject: [PATCH] Item#canEntityPickup diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index 00c58c1d..cb9e9f36 100644 +index 00c58c1d9..cb9e9f369 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -37,4 +37,20 @@ public interface Item extends Entity { @@ -30,5 +30,5 @@ index 00c58c1d..cb9e9f36 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch index c05f637f3..ba63ef429 100644 --- a/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-API-Patches/0053-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From ac6c730b5828a6f3afdfd5b74cfff7dc5ffb87af Mon Sep 17 00:00:00 2001 +From 2f6600df7fdfa7b4d7a3110475814d2c2d72d27f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:01 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java -index 951ea2cc..18d82c11 100644 +index 951ea2cc7..18d82c111 100644 --- a/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerPickupItemEvent.java @@ -17,6 +17,7 @@ import org.jetbrains.annotations.NotNull; @@ -53,5 +53,5 @@ index 951ea2cc..18d82c11 100644 @NotNull -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch index 878369576..734c7ff85 100644 --- a/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-API-Patches/0054-PlayerAttemptPickupItemEvent.patch @@ -1,4 +1,4 @@ -From b8556b9570db71c4791eb5ec64ecd258d48e9737 Mon Sep 17 00:00:00 2001 +From f5f3d8868eddd5a287febdd2f4ce1d62eac6122e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:37 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java new file mode 100644 -index 00000000..fb5cb3dc +index 000000000..fb5cb3dc4 --- /dev/null +++ b/src/main/java/org/bukkit/event/player/PlayerAttemptPickupItemEvent.java @@ -0,0 +1,89 @@ @@ -100,5 +100,5 @@ index 00000000..fb5cb3dc + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch index 38cd92a02..3f5c968ab 100644 --- a/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch +++ b/Spigot-API-Patches/0055-Add-UnknownCommandEvent.patch @@ -1,4 +1,4 @@ -From 7d8324440f38691b133a6173eec32ffff6764533 Mon Sep 17 00:00:00 2001 +From c9b7dd5b35264329e3f69140fb8845e44bd1b251 Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:06 -0400 Subject: [PATCH] Add UnknownCommandEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java new file mode 100644 -index 00000000..251342c3 +index 000000000..251342c3c --- /dev/null +++ b/src/main/java/org/bukkit/event/command/UnknownCommandEvent.java @@ -0,0 +1,82 @@ @@ -93,5 +93,5 @@ index 00000000..251342c3 +} + -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch index c195839e4..72603eaf8 100644 --- a/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch +++ b/Spigot-API-Patches/0056-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 1713c641bba9f7f2a2a9f8e15d3c3460b63c75e9 Mon Sep 17 00:00:00 2001 +From ce40c2ae5ef2185bbe92984163dd404087d6141d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 21:46:46 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -318,5 +318,5 @@ index 112098f9b..6778ac8e5 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch index a723bc1ee..175a12421 100644 --- a/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch +++ b/Spigot-API-Patches/0057-Shoulder-Entities-Release-API.patch @@ -1,11 +1,11 @@ -From 9d1fc09e269f884e5740bfc253532f11c0e26d79 Mon Sep 17 00:00:00 2001 +From 0a6bf8a64b4096498da9a4846ec9cc81c7075f4e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:04:51 -0400 Subject: [PATCH] Shoulder Entities Release API diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 6277f392..5b5fb303 100644 +index 6277f3928..5b5fb3034 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -324,6 +324,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -36,5 +36,5 @@ index 6277f392..5b5fb303 100644 * Discover a recipe for this player such that it has not already been * discovered. This method will add the key's associated recipe to the -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch index 96df4af40..53e9c6f77 100644 --- a/Spigot-API-Patches/0058-Profile-Lookup-Events.patch +++ b/Spigot-API-Patches/0058-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From 0ae5d7576d18a61f327e7ebb939a3cb9aa79f7d4 Mon Sep 17 00:00:00 2001 +From ee60b16c81cd7ad8564d94a908c93eae2263973e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 16:30:44 -0400 Subject: [PATCH] Profile Lookup Events @@ -8,7 +8,7 @@ profiles that had to be looked up. diff --git a/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java new file mode 100644 -index 00000000..8df37c07 +index 000000000..8df37c07c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/LookupProfileEvent.java @@ -0,0 +1,46 @@ @@ -60,7 +60,7 @@ index 00000000..8df37c07 +} diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java new file mode 100644 -index 00000000..4dcf6242 +index 000000000..4dcf6242c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreLookupProfileEvent.java @@ -0,0 +1,108 @@ @@ -173,5 +173,5 @@ index 00000000..4dcf6242 + +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch index 3daf06a90..d120b7352 100644 --- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch @@ -1,11 +1,11 @@ -From 5c5b505bed7e25ccca0603f053eb434501af7f47 Mon Sep 17 00:00:00 2001 +From cf40a09c3aafc120d4653b62ade05c18cf6574f6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 4e4445d1..e2952209 100644 +index 4e4445d18..e2952209d 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -609,5 +609,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -22,5 +22,5 @@ index 4e4445d1..e2952209 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch index 95307269c..d8f712eeb 100644 --- a/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-API-Patches/0060-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From 72e4471858378ddc591e391d2aae62c1937fb07d Mon Sep 17 00:00:00 2001 +From 550cd3e16b4c171704291fe55100ff9e3cdba55e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:12:48 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -8,7 +8,7 @@ and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java new file mode 100644 -index 00000000..163ffe8f +index 000000000..163ffe8ff --- /dev/null +++ b/src/main/java/org/bukkit/inventory/ArmoredHorseInventory.java @@ -0,0 +1,21 @@ @@ -34,7 +34,7 @@ index 00000000..163ffe8f + void setArmor(@Nullable ItemStack stack); +} diff --git a/src/main/java/org/bukkit/inventory/HorseInventory.java b/src/main/java/org/bukkit/inventory/HorseInventory.java -index 608e99c4..53498deb 100644 +index 608e99c42..53498debe 100644 --- a/src/main/java/org/bukkit/inventory/HorseInventory.java +++ b/src/main/java/org/bukkit/inventory/HorseInventory.java @@ -5,20 +5,4 @@ import org.jetbrains.annotations.Nullable; @@ -60,7 +60,7 @@ index 608e99c4..53498deb 100644 -} +public interface HorseInventory extends AbstractHorseInventory, ArmoredHorseInventory {} diff --git a/src/main/java/org/bukkit/inventory/LlamaInventory.java b/src/main/java/org/bukkit/inventory/LlamaInventory.java -index 2fa2c9d0..5ac1afb8 100644 +index 2fa2c9d07..5ac1afb8a 100644 --- a/src/main/java/org/bukkit/inventory/LlamaInventory.java +++ b/src/main/java/org/bukkit/inventory/LlamaInventory.java @@ -6,7 +6,7 @@ import org.jetbrains.annotations.Nullable; @@ -74,7 +74,7 @@ index 2fa2c9d0..5ac1afb8 100644 * Gets the item in the llama's decor slot. diff --git a/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java new file mode 100644 -index 00000000..7944f26a +index 000000000..7944f26a3 --- /dev/null +++ b/src/main/java/org/bukkit/inventory/SaddledHorseInventory.java @@ -0,0 +1,3 @@ @@ -82,5 +82,5 @@ index 00000000..7944f26a + +public interface SaddledHorseInventory extends AbstractHorseInventory {} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0061-ensureServerConversions-API.patch b/Spigot-API-Patches/0061-ensureServerConversions-API.patch index 2c4a47f76..2319955e7 100644 --- a/Spigot-API-Patches/0061-ensureServerConversions-API.patch +++ b/Spigot-API-Patches/0061-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From 246d7a5d7608b26b9749a52b8d2bd16dc34c0aa5 Mon Sep 17 00:00:00 2001 +From ea049a06b4c2090fbf19ac3bf86bf2bc4662f49e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index 4ff149fd..bb3f7cdc 100644 +index 4ff149fd9..bb3f7cdc1 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -141,4 +141,17 @@ public interface ItemFactory { @@ -29,7 +29,7 @@ index 4ff149fd..bb3f7cdc 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 180c292f..ca6d1233 100644 +index f70a6a22b..07aa65d1a 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -536,7 +536,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -62,5 +62,5 @@ index 180c292f..ca6d1233 100644 + // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch index 57112ae62..d1f9ede07 100644 --- a/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch +++ b/Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch @@ -1,4 +1,4 @@ -From 3f4a17835ea5512030e329f447171e75323f9bf9 Mon Sep 17 00:00:00 2001 +From 50e776a94f7520476e8899ecd8573b261c0fc06e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:55:48 -0400 Subject: [PATCH] Add getI18NDisplayName API @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java -index bb3f7cdc..3cada348 100644 +index bb3f7cdc1..3cada3487 100644 --- a/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java @@ -153,5 +153,16 @@ public interface ItemFactory { @@ -29,7 +29,7 @@ index bb3f7cdc..3cada348 100644 // Paper end } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index ca6d1233..8adf9399 100644 +index 07aa65d1a..e9ba31152 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -609,5 +609,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -51,5 +51,5 @@ index ca6d1233..8adf9399 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch index 24a44925a..7ed5ce1f1 100644 --- a/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-API-Patches/0063-ProfileWhitelistVerifyEvent.patch @@ -1,4 +1,4 @@ -From 99c1ecbc8bb08b1102844c2e06aff75e8e189876 Mon Sep 17 00:00:00 2001 +From 60fe06db929a635f93e050456fa5e2e0800592c2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:34 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent @@ -9,7 +9,7 @@ Allows you to do dynamic whitelisting and change of kick message diff --git a/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java new file mode 100644 -index 00000000..b1017628 +index 000000000..b10176289 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/ProfileWhitelistVerifyEvent.java @@ -0,0 +1,117 @@ @@ -131,5 +131,5 @@ index 00000000..b1017628 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch index 3d4b6c24a..d0ec4fbc9 100644 --- a/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch +++ b/Spigot-API-Patches/0064-Make-plugins-list-alphabetical.patch @@ -1,11 +1,11 @@ -From eab6fa45fa7d9eddd35d65024ec8e8b2e89d3088 Mon Sep 17 00:00:00 2001 +From 2f10a17ee8ab17bebd10793c17d178d6800a973e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 02:08:55 -0500 Subject: [PATCH] Make /plugins list alphabetical diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index bcb576a4..a1071e31 100644 +index bcb576a42..a1071e317 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -3,6 +3,9 @@ package org.bukkit.command.defaults; @@ -58,5 +58,5 @@ index bcb576a4..a1071e31 100644 } } -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch index f03397d2f..512f869a0 100644 --- a/Spigot-API-Patches/0065-LivingEntity-setKiller.patch +++ b/Spigot-API-Patches/0065-LivingEntity-setKiller.patch @@ -1,4 +1,4 @@ -From c7c6e0f77754ecb3b0a30e5f64b9003bfb66a76c Mon Sep 17 00:00:00 2001 +From 238ffac36922679c18effa5dc57ec213734e14a5 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:43 -0500 Subject: [PATCH] LivingEntity#setKiller @@ -25,5 +25,5 @@ index 52541e496..ae712e76d 100644 * Adds the given {@link PotionEffect} to the living entity. * -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch index 90e9466a6..923770a3e 100644 --- a/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch +++ b/Spigot-API-Patches/0066-Handle-plugin-prefixes-in-implementation-logging-con.patch @@ -1,4 +1,4 @@ -From d5fd96d447dd6f8d8fa433d18082329fea603982 Mon Sep 17 00:00:00 2001 +From 34676ba4f3ae9ae7934cf80a78b2230f43d24941 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:13 +0200 Subject: [PATCH] Handle plugin prefixes in implementation logging @@ -17,7 +17,7 @@ The implementation should handle plugin prefixes by displaying logger names when appropriate. diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index 22319005..bb2e55e9 100644 +index 223190054..bb2e55e97 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase { @@ -40,5 +40,5 @@ index 22319005..bb2e55e9 100644 /** -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index 369e4abc0..08b201035 100644 --- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 349a9bf5d5d38cd62f2ed1df7e6524cb9900c6e2 Mon Sep 17 00:00:00 2001 +From ffef7f82e6a112395460bed64907a045656d685a Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:12 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index 5c25ff12..a71015f4 100644 +index 3712b70bc..2cb971408 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ @@ -32,7 +32,7 @@ index 5c25ff12..a71015f4 100644 junit diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index febfec6e..79890c68 100644 +index febfec6ef..79890c68f 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor { @@ -50,5 +50,5 @@ index febfec6e..79890c68 100644 * Returns the name of the plugin. *

-- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch index e6318ccea..8d8d5a913 100644 --- a/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch +++ b/Spigot-API-Patches/0068-Add-workaround-for-plugins-modifying-the-parent-of-t.patch @@ -1,4 +1,4 @@ -From c8c8741ee68669f675d4cb4dc5abc430d289bcf1 Mon Sep 17 00:00:00 2001 +From 470028a790e67685c105a18098263915ec876864 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 19:41:20 +0200 Subject: [PATCH] Add workaround for plugins modifying the parent of the plugin @@ -14,7 +14,7 @@ parent of the plugin logger to avoid this. diff --git a/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java new file mode 100644 -index 00000000..76f2cb9c +index 000000000..76f2cb9cd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/PaperPluginLogger.java @@ -0,0 +1,41 @@ @@ -60,7 +60,7 @@ index 00000000..76f2cb9c + +} diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java -index bb2e55e9..04fa3991 100644 +index bb2e55e97..04fa3991f 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -42,7 +42,7 @@ public abstract class JavaPlugin extends PluginBase { @@ -87,7 +87,7 @@ index bb2e55e9..04fa3991 100644 /** diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java -index 36f542a8..3a02dbe9 100644 +index 36f542a85..3a02dbe9d 100644 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java @@ -42,6 +42,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -116,5 +116,5 @@ index 36f542a8..3a02dbe9 100644 } } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch index 4257ac636..424b4acd0 100644 --- a/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch +++ b/Spigot-API-Patches/0069-Add-PlayerJumpEvent.patch @@ -1,4 +1,4 @@ -From 391c8c2ec698ac64a495038842cbb2228c92e4bc Mon Sep 17 00:00:00 2001 +From c4ca332d0ca8e7faf24ebde6d024bfd7af31c49c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:32 -0400 Subject: [PATCH] Add PlayerJumpEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java new file mode 100644 -index 00000000..289a0d78 +index 000000000..289a0d784 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerJumpEvent.java @@ -0,0 +1,106 @@ @@ -117,5 +117,5 @@ index 00000000..289a0d78 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch index 20f873371..27ae95ced 100644 --- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From acb615089a33d457c84bce216ba87649efe7e50d Mon Sep 17 00:00:00 2001 +From b59461723c656710c7e6ae295ab42941d8c2e1df Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:44:42 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to: diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java new file mode 100644 -index 00000000..7b2af1bd +index 000000000..7b2af1bd7 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java @@ -0,0 +1,41 @@ @@ -57,7 +57,7 @@ index 00000000..7b2af1bd + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index da36c8df..dbe53123 100644 +index f10ef7ae7..a0590f369 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; @@ -70,5 +70,5 @@ index da36c8df..dbe53123 100644 /** * Gets the "friendly" name to display of this player. This may include -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch index 5c74eda25..ba0f98308 100644 --- a/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-API-Patches/0071-Add-PlayerArmorChangeEvent.patch @@ -1,4 +1,4 @@ -From 119d214a5cf12953f1d00e283e2c5768be6d9d03 Mon Sep 17 00:00:00 2001 +From 3c8d83a02f90cdcadab5ab2b4caa858424ae992f Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:45:59 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java new file mode 100644 -index 00000000..2827a100 +index 000000000..2827a1002 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerArmorChangeEvent.java @@ -0,0 +1,137 @@ @@ -148,5 +148,5 @@ index 00000000..2827a100 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch index c14620bb6..05ab781bb 100644 --- a/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-API-Patches/0072-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From aab556b666c1f5b415f1bd6fd6f3598964819f4e Mon Sep 17 00:00:00 2001 +From d6f2a708c9cb4611c6f9fe506432e7a3968192f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:10:01 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -9,7 +9,7 @@ on the real tile entity. This is useful for where performance is needed diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index ab6750c7..af4ffada 100644 +index ab6750c7a..af4ffada0 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -268,6 +268,16 @@ public interface Block extends Metadatable { @@ -30,5 +30,5 @@ index ab6750c7..af4ffada 100644 * Returns the biome that this block resides in * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch index 77b044008..f03bf26c0 100644 --- a/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch +++ b/Spigot-API-Patches/0073-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From 0cf763fb20fce10342ebec0cbcfa200d8b8a7a5b Mon Sep 17 00:00:00 2001 +From fadca523e626b46d425dc49ec7a52379c7ab963d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:17:09 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -13,7 +13,7 @@ completion, such as offline players. diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java new file mode 100644 -index 00000000..619ed371 +index 000000000..619ed3716 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java @@ -0,0 +1,177 @@ @@ -195,7 +195,7 @@ index 00000000..619ed371 + } +} diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java -index d1a9956a..f96c4ba5 100644 +index d1a9956a1..f96c4ba53 100644 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java @@ -1,5 +1,6 @@ @@ -265,5 +265,5 @@ index d1a9956a..f96c4ba5 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch index 468431ec5..893a466fa 100644 --- a/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch +++ b/Spigot-API-Patches/0074-Display-warning-on-deprecated-recipe-API.patch @@ -1,4 +1,4 @@ -From e2ace04b7cc11c54b3a492d9a95a492b6aad8881 Mon Sep 17 00:00:00 2001 +From a05418027d1bbb6f2adaeef7fa06c19b2f9ca0fd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 9 Dec 2017 12:40:25 -0500 Subject: [PATCH] Display warning on deprecated recipe API @@ -10,7 +10,7 @@ on the players login. Plugin authors need to define a key to keep it consistent between server restarts. diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d74b3114..d742c405 100644 +index d74b3114f..d742c4058 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -25,6 +25,7 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -22,7 +22,7 @@ index d74b3114..d742c405 100644 } diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 68447fb8..84062dd7 100644 +index 68447fb8c..84062dd71 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -26,6 +26,7 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -34,5 +34,5 @@ index 68447fb8..84062dd7 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch index e91eb8bdf..076b9a64c 100644 --- a/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch +++ b/Spigot-API-Patches/0075-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 76a536dbdb61eb6fde0d55df507f92deb21e6a31 Mon Sep 17 00:00:00 2001 +From 71071c945004982e39bd9f02ca5dd1183b1f37e0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:00:41 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -7,7 +7,7 @@ Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java new file mode 100644 -index 00000000..f7beb22d +index 000000000..f7beb22d5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPickupExperienceEvent.java @@ -0,0 +1,80 @@ @@ -92,5 +92,5 @@ index 00000000..f7beb22d + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch index cb9f21034..db6a58464 100644 --- a/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch +++ b/Spigot-API-Patches/0076-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 72c291be9d0bb7daaf28bba76ff4968f10eb05df Mon Sep 17 00:00:00 2001 +From 8ff1280282b3c67e3fb94958a9a9c4f4d6410faa Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:56:24 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -9,7 +9,7 @@ metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java new file mode 100644 -index 00000000..0ce3e397 +index 000000000..0ce3e3977 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ExperienceOrbMergeEvent.java @@ -0,0 +1,87 @@ @@ -101,5 +101,5 @@ index 00000000..0ce3e397 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch index 3cabe5615..d57bd8f94 100644 --- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From af375fcae65a50a414f7c3b33c75d90d43edf6a9 Mon Sep 17 00:00:00 2001 +From 704a8eb995dad4c5e12beae1782d462c021b1ce9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:38:07 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index dbe53123..420aa906 100644 +index a0590f369..088430a45 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -934,12 +934,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -49,5 +49,5 @@ index dbe53123..420aa906 100644 /** * Gives the player the amount of experience levels specified. Levels can -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch index 687201765..6472e5079 100644 --- a/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch +++ b/Spigot-API-Patches/0078-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From a532d8b8494cbfe850034f92ca644fc5f566c4fc Mon Sep 17 00:00:00 2001 +From 51c2512ba9f95dbfd65b88b9fe21d56bde914c32 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 16:59:43 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -16,7 +16,7 @@ See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java new file mode 100644 -index 00000000..d5edde9c +index 000000000..d5edde9cd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreCreatureSpawnEvent.java @@ -0,0 +1,104 @@ @@ -125,5 +125,5 @@ index 00000000..d5edde9c + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch index 37ede87eb..7373f2b59 100644 --- a/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-API-Patches/0079-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From 8bb61dab0ecdcf6e35175d10d9d2f8a003505894 Mon Sep 17 00:00:00 2001 +From a33bd8275812e8768a043bc3f267fbf8ac6db744 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:31:37 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -10,7 +10,7 @@ Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java new file mode 100644 -index 00000000..112a0dbf +index 000000000..112a0dbf5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PlayerNaturallySpawnCreaturesEvent.java @@ -0,0 +1,64 @@ @@ -79,5 +79,5 @@ index 00000000..112a0dbf + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch index 255cf9405..22b996ead 100644 --- a/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-API-Patches/0080-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From cbdb821df0d1d148d04aeda9d0f83199e90c6f72 Mon Sep 17 00:00:00 2001 +From 9a1ede056ec1aba4f009706f545751ab7a6d40d5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:29:28 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java -index 943d751f..a6914f01 100644 +index 943d751fb..a6914f01e 100644 --- a/src/main/java/org/bukkit/block/Skull.java +++ b/src/main/java/org/bukkit/block/Skull.java @@ -7,6 +7,7 @@ import org.bukkit.block.data.BlockData; @@ -40,7 +40,7 @@ index 943d751f..a6914f01 100644 * Gets the rotation of the skull in the world (or facing direction if this * is a wall mounted skull). diff --git a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java -index 35a39203..8b2465ea 100644 +index 35a392033..8b2465ea2 100644 --- a/src/main/java/org/bukkit/inventory/meta/SkullMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/SkullMeta.java @@ -1,9 +1,11 @@ @@ -77,5 +77,5 @@ index 35a39203..8b2465ea 100644 * Gets the owner of the skull. * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch index 512cdb161..420573e4d 100644 --- a/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch +++ b/Spigot-API-Patches/0081-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 49361ac9699332af1561efa4ef6e66a17aede152 Mon Sep 17 00:00:00 2001 +From a9c4c45122619d2ce3561c256614f4c81b893309 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:08 -0500 Subject: [PATCH] Fill Profile Property Events @@ -12,7 +12,7 @@ This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java new file mode 100644 -index 00000000..71f36e9c +index 000000000..71f36e9ca --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/FillProfileEvent.java @@ -0,0 +1,75 @@ @@ -93,7 +93,7 @@ index 00000000..71f36e9c +} diff --git a/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java new file mode 100644 -index 00000000..021bc863 +index 000000000..021bc8631 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/profile/PreFillProfileEvent.java @@ -0,0 +1,77 @@ @@ -175,5 +175,5 @@ index 00000000..021bc863 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch index 0a82f0bec..acce16a85 100644 --- a/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-API-Patches/0082-PlayerAdvancementCriterionGrantEvent.patch @@ -1,4 +1,4 @@ -From be3e65856f9a9b498ac9a1e8b9427d57e533af6d Mon Sep 17 00:00:00 2001 +From 16e6184f6baaa78ed043b38ab35a19ddbd296c21 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:14 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java new file mode 100644 -index 00000000..bb8d7c95 +index 000000000..bb8d7c959 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerAdvancementCriterionGrantEvent.java @@ -0,0 +1,63 @@ @@ -74,5 +74,5 @@ index 00000000..bb8d7c95 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch index 2c6889d0c..cec7226e5 100644 --- a/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-API-Patches/0083-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 71ae7aea9324a132adf65042528ec5b02fe13c55 Mon Sep 17 00:00:00 2001 +From a5fc188f4ae9a73cf2c391bbf684aba1220eb83d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:06:24 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -12,7 +12,7 @@ starting point for future additions in this area. diff --git a/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java new file mode 100644 -index 00000000..7e4acfff +index 000000000..7e4acfff1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/inventory/meta/ArmorStandMeta.java @@ -0,0 +1,78 @@ @@ -95,5 +95,5 @@ index 00000000..7e4acfff + void setMarker(boolean marker); +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0084-Optimize-Hoppers.patch b/Spigot-API-Patches/0084-Optimize-Hoppers.patch index 80a85adff..baef2fc24 100644 --- a/Spigot-API-Patches/0084-Optimize-Hoppers.patch +++ b/Spigot-API-Patches/0084-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 7a9bf3167d5a6e2cc1a2fbd66f739f373ac54e9c Mon Sep 17 00:00:00 2001 +From 6851eb5619af4d2f79884831812a779117402e7c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 18 Jan 2018 01:00:27 -0500 Subject: [PATCH] Optimize Hoppers @@ -7,7 +7,7 @@ Adds data about what Item related methods were used in InventoryMoveItem event so that the server can improve the performance of this event. diff --git a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java -index a8c48f5a..04d4a83b 100644 +index a8c48f5a4..04d4a83bf 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryMoveItemEvent.java @@ -31,6 +31,8 @@ public class InventoryMoveItemEvent extends Event implements Cancellable { @@ -38,5 +38,5 @@ index a8c48f5a..04d4a83b 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch index 138ebacae..650598ff0 100644 --- a/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-API-Patches/0085-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 5cf43f147d4882bf3bd2199979fb4915b74e3e4c Mon Sep 17 00:00:00 2001 +From 6ee338de00379380b81ef00c5af09fa30dd640ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 00:55:52 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/entity/Tameable.java b/src/main/java/org/bukkit/entity/Tameable.java -index 0c066bdf..957a6016 100644 +index 0c066bdfc..957a60167 100644 --- a/src/main/java/org/bukkit/entity/Tameable.java +++ b/src/main/java/org/bukkit/entity/Tameable.java @@ -1,5 +1,6 @@ @@ -41,5 +41,5 @@ index 0c066bdf..957a6016 100644 */ @Nullable -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 95f70bdb8..8a276fecf 100644 --- a/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-API-Patches/0086-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From 1f100fb84d5576405ccbd83e5b9a9c08210ab689 Mon Sep 17 00:00:00 2001 +From 716f586dbbbef1b30c684d64ed58a19397aa6b70 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:43:30 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index c8384da6..6c09ea6c 100644 +index c8384da69..6c09ea6c6 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -2,6 +2,9 @@ package org.bukkit.event.player; @@ -53,5 +53,5 @@ index c8384da6..6c09ea6c 100644 this.message = ""; this.name = name; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch index 419aa1b0c..9a14aaeb8 100644 --- a/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0087-Add-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 3a712b40988d06d9a8f42119c9eb6fc0968ae18d Mon Sep 17 00:00:00 2001 +From 2ac81c41e0800c8bfe372eea825fbdcebfe7ed62 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:55:38 +0200 Subject: [PATCH] Add extended PaperServerListPingEvent @@ -8,7 +8,7 @@ and allows full control of the response sent to the client. diff --git a/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java new file mode 100644 -index 00000000..0cc5dd57 +index 000000000..0cc5dd573 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/PaperServerListPingEvent.java @@ -0,0 +1,323 @@ @@ -337,7 +337,7 @@ index 00000000..0cc5dd57 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java new file mode 100644 -index 00000000..517d1523 +index 000000000..517d15238 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java @@ -0,0 +1,13 @@ @@ -355,7 +355,7 @@ index 00000000..517d1523 + +} diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java -index 612958a3..bb4f7702 100644 +index 612958a33..bb4f7702c 100644 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java @@ -18,4 +18,9 @@ public interface CachedServerIcon { @@ -369,5 +369,5 @@ index 612958a3..bb4f7702 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch index 9e8f7e30c..4ade83e75 100644 --- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 5262b321dc03d1f58178d7b684ecad630cd041a4 Mon Sep 17 00:00:00 2001 +From 401c968c7e87d2d3a91798f153b8d63c1d37d269 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:28:55 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 420aa906..083110cc 100644 +index 088430a45..700b8721a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -2,6 +2,7 @@ package org.bukkit.entity; @@ -39,5 +39,5 @@ index 420aa906..083110cc 100644 // Spigot start -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch index 743bd867a..d22547010 100644 --- a/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch +++ b/Spigot-API-Patches/0089-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 9dcbe2f6b819b55841e1ebb138516d7a281377cc Mon Sep 17 00:00:00 2001 +From 3af92ccbed37aa47009dc73c9e40f7d6db1e2255 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:39:28 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -57,5 +57,5 @@ index 6778ac8e5..11fffc514 100644 * Gets the plugin manager for interfacing with plugins. * -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch index 2b8fb636b..faca7dd1f 100644 --- a/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch +++ b/Spigot-API-Patches/0090-Add-legacy-ping-support-to-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 6b0a919a4594ce2cfe55bedf3a7faecd0a266887 Mon Sep 17 00:00:00 2001 +From 046c71d911ea7b1bdcd6f35fb3d5fa7f77d63384 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:20 +0200 Subject: [PATCH] Add legacy ping support to PaperServerListPingEvent @@ -8,7 +8,7 @@ client that does not support all of the features provided in the event. diff --git a/src/main/java/com/destroystokyo/paper/network/StatusClient.java b/src/main/java/com/destroystokyo/paper/network/StatusClient.java -index 517d1523..ffda9f6a 100644 +index 517d15238..ffda9f6a8 100644 --- a/src/main/java/com/destroystokyo/paper/network/StatusClient.java +++ b/src/main/java/com/destroystokyo/paper/network/StatusClient.java @@ -10,4 +10,16 @@ import com.destroystokyo.paper.event.server.PaperServerListPingEvent; @@ -29,5 +29,5 @@ index 517d1523..ffda9f6a 100644 + } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch index b1d41731d..a66aa0e98 100644 --- a/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-API-Patches/0091-Add-method-to-open-already-placed-sign.patch @@ -1,11 +1,11 @@ -From 7b106928641e7ae0f15db3f9bbad7e9cff20dea2 Mon Sep 17 00:00:00 2001 +From b8f823a3d39e1cc99f25b85485225d9f1e8c980c Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:28:43 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 5b5fb303..cdbac95b 100644 +index 5b5fb3034..cdbac95bb 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -458,4 +458,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -23,5 +23,5 @@ index 5b5fb303..cdbac95b 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch index e3c003ac7..c6e00ed8b 100644 --- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch +++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch @@ -1,4 +1,4 @@ -From 10af44a728883c15bac804518f6f98cf91194944 Mon Sep 17 00:00:00 2001 +From da259346df446940b700aa31114efd056fef37b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Apr 2018 10:28:50 -0400 Subject: [PATCH] Add Ban Methods to Player Objects @@ -8,7 +8,7 @@ Allows a more logical API for banning players. player.banPlayer("Breaking the rules"); diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index ffc8ad37..222a9a7b 100644 +index ffc8ad373..222a9a7bf 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -44,6 +44,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -74,7 +74,7 @@ index ffc8ad37..222a9a7b 100644 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 083110cc..2c6ff39e 100644 +index 700b8721a..43e191649 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -3,6 +3,10 @@ package org.bukkit.entity; @@ -252,5 +252,5 @@ index 083110cc..2c6ff39e 100644 /** * Sends an Action Bar message to the client. -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch index 11243d668..63520a713 100644 --- a/Spigot-API-Patches/0093-EndermanEscapeEvent.patch +++ b/Spigot-API-Patches/0093-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 933718c31587aca9f00374ee29bb61c0b844953f Mon Sep 17 00:00:00 2001 +From adcdedec7cd6db5eac2e0e059634490079f30d06 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:14:30 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -9,7 +9,7 @@ You may cancel this, enabling ranged attacks to damage the enderman for example. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java new file mode 100644 -index 00000000..806112a8 +index 000000000..806112a8b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanEscapeEvent.java @@ -0,0 +1,87 @@ @@ -101,5 +101,5 @@ index 00000000..806112a8 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch index cd3a9b87a..0cfc0166a 100644 --- a/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch +++ b/Spigot-API-Patches/0094-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 22b8e1bb9689bb3b947d2129d699757c7bac34dd Mon Sep 17 00:00:00 2001 +From 370964285ffa5b68ca08697985f394d4c91b6c79 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:15 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/org/bukkit/entity/Enderman.java b/src/main/java/org/bukkit/entity/Enderman.java -index bb325d9c..821c690f 100644 +index bb325d9c8..821c690f8 100644 --- a/src/main/java/org/bukkit/entity/Enderman.java +++ b/src/main/java/org/bukkit/entity/Enderman.java @@ -10,6 +10,17 @@ import org.jetbrains.annotations.Nullable; @@ -28,5 +28,5 @@ index bb325d9c..821c690f 100644 * Gets the id and data of the block that the Enderman is carrying. * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch index fe47a6d36..bf3c88196 100644 --- a/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch +++ b/Spigot-API-Patches/0095-Additional-world.getNearbyEntities-API-s.patch @@ -1,4 +1,4 @@ -From bbc895e361521f3a33a517aa5b067dc3ccb003ad Mon Sep 17 00:00:00 2001 +From 57cf333277477c1a6f7ac9b5fcf035b530841765 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:55:28 -0400 Subject: [PATCH] Additional world.getNearbyEntities API's @@ -6,7 +6,7 @@ Subject: [PATCH] Additional world.getNearbyEntities API's Provides more methods to get nearby entities, and filter by types and predicates diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 3b027f67..fbe7e76c 100644 +index 3b027f67c..fbe7e76c0 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1,6 +1,9 @@ @@ -277,7 +277,7 @@ index 3b027f67..fbe7e76c 100644 * Get a list of all players in this World * diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 6c09ea6c..76c4a1a6 100644 +index 6c09ea6c6..76c4a1a6e 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -42,8 +42,7 @@ public class AsyncPlayerPreLoginEvent extends Event { @@ -291,5 +291,5 @@ index 6c09ea6c..76c4a1a6 100644 */ public void setPlayerProfile(@NotNull PlayerProfile profile) { -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch index 6d507a8c9..f4cf7a5a4 100644 --- a/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch +++ b/Spigot-API-Patches/0096-Location.isChunkLoaded-API.patch @@ -1,11 +1,11 @@ -From 2e924d63585468de921954ade22acf335dd0d643 Mon Sep 17 00:00:00 2001 +From 6f24ef7d7b7146b9d2c032252b7866657b31c3a1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 19:27:31 -0400 Subject: [PATCH] Location.isChunkLoaded() API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 0939a807..6c8b8edd 100644 +index 0939a8070..6c8b8eddc 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -533,6 +533,7 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -17,5 +17,5 @@ index 0939a807..6c8b8edd 100644 public boolean equals(Object obj) { if (obj == null) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch index eded208b2..cbb8dbe57 100644 --- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 14230ba76aa0ced5ca25e493c15944568ca03365 Mon Sep 17 00:00:00 2001 +From 77befc8808bf1a216fdae6060f9a19d5f0b36df0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Aug 2017 23:58:48 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java new file mode 100644 -index 00000000..06f1602f +index 000000000..06f1602f5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java @@ -0,0 +1,478 @@ @@ -493,7 +493,7 @@ index 00000000..06f1602f + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 49467ac7..d2ceb07c 100644 +index 49467ac70..d2ceb07c7 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java @@ -96,6 +96,17 @@ public enum Particle { @@ -515,7 +515,7 @@ index 49467ac7..d2ceb07c 100644 * Options which can be applied to redstone dust particles - a particle * color and size. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index fbe7e76c..085c7a42 100644 +index fbe7e76c0..085c7a42c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2433,7 +2433,57 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -578,5 +578,5 @@ index fbe7e76c..085c7a42 100644 /** * Spawns the particle (the number of times specified by count) -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch index 467ad282d..4ec2c5f98 100644 --- a/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch +++ b/Spigot-API-Patches/0098-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From c8c18603ed87388a020dd699aa5c7ab3df054816 Mon Sep 17 00:00:00 2001 +From d3004d7b163f83fe6e98647f03cdfe3a90d388ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:17:44 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -9,7 +9,7 @@ This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java new file mode 100644 -index 00000000..f530a3d9 +index 000000000..f530a3d93 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EndermanAttackPlayerEvent.java @@ -0,0 +1,101 @@ @@ -115,5 +115,5 @@ index 00000000..f530a3d9 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch index 006a8323e..55a1aaad5 100644 --- a/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch +++ b/Spigot-API-Patches/0099-Close-Plugin-Class-Loaders-on-Disable.patch @@ -1,4 +1,4 @@ -From 889d1e3dc852de32f8f2e72ffde3f5917fa7dd5c Mon Sep 17 00:00:00 2001 +From 69e017b9ea1d488c8d73dc1d2cbb55bab33dc917 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 21:33:35 -0400 Subject: [PATCH] Close Plugin Class Loaders on Disable @@ -7,7 +7,7 @@ This should close more memory leaks from /reload and disabling plugins, by closing the class loader and the jar file. diff --git a/src/main/java/org/bukkit/plugin/PluginLoader.java b/src/main/java/org/bukkit/plugin/PluginLoader.java -index a88733f1..6ab9cd82 100644 +index a88733f1c..6ab9cd821 100644 --- a/src/main/java/org/bukkit/plugin/PluginLoader.java +++ b/src/main/java/org/bukkit/plugin/PluginLoader.java @@ -77,4 +77,18 @@ public interface PluginLoader { @@ -30,7 +30,7 @@ index a88733f1..6ab9cd82 100644 + // Paper end - close Classloader on disable } diff --git a/src/main/java/org/bukkit/plugin/PluginManager.java b/src/main/java/org/bukkit/plugin/PluginManager.java -index 41e26451..86cc5025 100644 +index 41e26451f..86cc5025a 100644 --- a/src/main/java/org/bukkit/plugin/PluginManager.java +++ b/src/main/java/org/bukkit/plugin/PluginManager.java @@ -161,6 +161,18 @@ public interface PluginManager { @@ -53,7 +53,7 @@ index 41e26451..86cc5025 100644 * Gets a {@link Permission} from its fully qualified name * diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 8ddaf9c2..8bb24f73 100644 +index 8ddaf9c2e..8bb24f734 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -492,17 +492,28 @@ public final class SimplePluginManager implements PluginManager { @@ -97,7 +97,7 @@ index 8ddaf9c2..8bb24f73 100644 lookupNames.clear(); dependencyGraph = GraphBuilder.directed().build(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index e72cbde4..32ec68b4 100644 +index e72cbde4b..32ec68b48 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -331,7 +331,7 @@ public final class JavaPluginLoader implements PluginLoader { @@ -140,5 +140,5 @@ index e72cbde4..32ec68b4 100644 } } -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch index 5e2ec94b7..5f0d332c4 100644 --- a/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch +++ b/Spigot-API-Patches/0100-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 7278c19fd5b1ecef74da0734e3905fd5cf3b9e82 Mon Sep 17 00:00:00 2001 +From 15909a0d10135b8cfa2062fb3df50d2277a10528 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:26:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -7,7 +7,7 @@ Fires when a witch consumes the potion in their hand diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java new file mode 100644 -index 00000000..fbbace36 +index 000000000..fbbace36d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchConsumePotionEvent.java @@ -0,0 +1,70 @@ @@ -83,7 +83,7 @@ index 00000000..fbbace36 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java new file mode 100644 -index 00000000..6ef6367b +index 000000000..6ef6367b6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -0,0 +1,33 @@ @@ -121,5 +121,5 @@ index 00000000..6ef6367b + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch index dac7d0878..029a15a56 100644 --- a/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch +++ b/Spigot-API-Patches/0101-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 08c8276bbf014d7ef1806907d04db5e70501d396 Mon Sep 17 00:00:00 2001 +From 3ebe597d0a39e9955c99a30520c05cb986f8b7a2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:39:09 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java -index 6ef6367b..688a596a 100644 +index 6ef6367b6..688a596aa 100644 --- a/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchThrowPotionEvent.java @@ -1,29 +1,77 @@ @@ -92,5 +92,5 @@ index 6ef6367b..688a596a 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch index bac603cf1..21e7d71ed 100644 --- a/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch +++ b/Spigot-API-Patches/0102-Location.toBlockLocation-toCenterLocation.patch @@ -1,4 +1,4 @@ -From 1917001bc1c9e3128db829877f21dca2ecddc96f Mon Sep 17 00:00:00 2001 +From d1e4f01c2240314cf9fb94f6a4175a7b61bd4626 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 24 May 2018 21:01:13 -0400 Subject: [PATCH] Location.toBlockLocation/toCenterLocation() @@ -6,7 +6,7 @@ Subject: [PATCH] Location.toBlockLocation/toCenterLocation() Convert location objects to their block coordinates, or the center of the block diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 6c8b8edd..f61bf28a 100644 +index 6c8b8eddc..f61bf28af 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -534,6 +534,31 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -42,5 +42,5 @@ index 6c8b8edd..f61bf28a 100644 public boolean equals(Object obj) { if (obj == null) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch index 052b9fa48..1b1878a8c 100644 --- a/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch +++ b/Spigot-API-Patches/0103-PotionEffect-clone-methods.patch @@ -1,11 +1,11 @@ -From 762830b92f0af77bac816faba90a025f178570b2 Mon Sep 17 00:00:00 2001 +From f5469866079fc18d5344de56358dcb363ba3d1c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Jun 2018 04:10:13 -0400 Subject: [PATCH] PotionEffect clone methods diff --git a/src/main/java/org/bukkit/potion/PotionEffect.java b/src/main/java/org/bukkit/potion/PotionEffect.java -index 60716c62..74767751 100644 +index 60716c627..747677511 100644 --- a/src/main/java/org/bukkit/potion/PotionEffect.java +++ b/src/main/java/org/bukkit/potion/PotionEffect.java @@ -101,6 +101,33 @@ public class PotionEffect implements ConfigurationSerializable { @@ -43,5 +43,5 @@ index 60716c62..74767751 100644 private static PotionEffectType getEffectType(@NotNull Map map) { int type = getInt(map, TYPE); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch index 6fa560608..51b19a885 100644 --- a/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch +++ b/Spigot-API-Patches/0104-WitchReadyPotionEvent.patch @@ -1,4 +1,4 @@ -From cdd08698855f82afa01e14e6c9c0b070c369cac9 Mon Sep 17 00:00:00 2001 +From 025707f03023e41f1c0d8e49273c01635edff01d Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:08 -0400 Subject: [PATCH] WitchReadyPotionEvent @@ -7,7 +7,7 @@ Control what potion the witch readies to use diff --git a/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java new file mode 100644 -index 00000000..5351b523 +index 000000000..5351b523d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/WitchReadyPotionEvent.java @@ -0,0 +1,80 @@ @@ -92,5 +92,5 @@ index 00000000..5351b523 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch index 59ae301ae..d181fccc1 100644 --- a/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 8a8c8d26dae2e332dd944219e0decc1c342d210e Mon Sep 17 00:00:00 2001 +From e3c1726bb11a89b2540c1c26f1282ef9d057ef73 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:59:50 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 8adf9399..7d2c5747 100644 +index e9ba31152..125b74dd8 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -621,5 +621,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -24,5 +24,5 @@ index 8adf9399..7d2c5747 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch index 0eb3c99ce..93a1468be 100644 --- a/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-API-Patches/0106-Add-EntityTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From e97a9fd1b5cd99d2f4787be40f72084f5c3517fe Mon Sep 17 00:00:00 2001 +From dbf6e3d0d411003e38f9fd4f9ccf156d9aa05a5b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 13:08:21 +0100 Subject: [PATCH] Add EntityTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityTeleportEndGatewayEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java new file mode 100644 -index 00000000..bfc69a43 +index 000000000..bfc69a43c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTeleportEndGatewayEvent.java @@ -0,0 +1,31 @@ @@ -42,5 +42,5 @@ index 00000000..bfc69a43 + +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch index 91e48ab16..04ccf6b83 100644 --- a/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-API-Patches/0107-Make-shield-blocking-delay-configurable.patch @@ -1,4 +1,4 @@ -From 071b34424f1f8e21825f757bfe107f01e49cfb31 Mon Sep 17 00:00:00 2001 +From 278caaa37f9a01a2a38dbf52f97db27232522fc8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:17:39 -0500 Subject: [PATCH] Make shield blocking delay configurable @@ -29,5 +29,5 @@ index ae712e76d..896b1971c 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index 2fd1c261c..fcf38842e 100644 --- a/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-API-Patches/0108-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 50b638683bcb7ea9e707774b978e2fe39273eb50 Mon Sep 17 00:00:00 2001 +From 2f6d3a08ba3c5b04124d61e35d4d1161c49e9f29 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:52:04 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java -index 18c5e31a..37dbc12e 100644 +index 18c5e31ab..37dbc12eb 100644 --- a/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityShootBowEvent.java @@ -2,6 +2,7 @@ package org.bukkit.event.entity; @@ -49,5 +49,5 @@ index 18c5e31a..37dbc12e 100644 this.projectile = projectile; this.force = force; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch index 080109236..3d380119a 100644 --- a/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch +++ b/Spigot-API-Patches/0109-Add-getNearbyXXX-methods-to-Location.patch @@ -1,11 +1,11 @@ -From d7f9ba53cda922d155687508de9cbe5649d52b62 Mon Sep 17 00:00:00 2001 +From 2b65b073a7c9d25f47d57bfb6e2db1cfb0797758 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 18 Jun 2018 00:41:46 -0500 Subject: [PATCH] Add "getNearbyXXX" methods to Location diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index f61bf28a..4cf22afc 100644 +index f61bf28af..4cf22afc3 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -12,6 +12,15 @@ import org.bukkit.util.Vector; @@ -274,5 +274,5 @@ index f61bf28a..4cf22afc 100644 @Override public boolean equals(Object obj) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch index e6679e435..278dcc909 100644 --- a/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch +++ b/Spigot-API-Patches/0110-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From 03c5cb95272596295784f23658d9c1f5c2094996 Mon Sep 17 00:00:00 2001 +From d5f5877c0b11a8379a0d9efdb9dfba3293d7c170 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:09:27 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -8,7 +8,7 @@ Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java new file mode 100644 -index 00000000..5d04a22f +index 000000000..5d04a22fd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerReadyArrowEvent.java @@ -0,0 +1,93 @@ @@ -106,5 +106,5 @@ index 00000000..5d04a22f + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch index d805d7009..91fc5c3ab 100644 --- a/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch +++ b/Spigot-API-Patches/0111-Add-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From e225ed9b2fb911a78ef36cb625f75ae376920551 Mon Sep 17 00:00:00 2001 +From 4591321a0b6f1215bbcd8ee48963b40a0ac2a9ca Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:40:39 +0200 Subject: [PATCH] Add EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add EntityKnockbackByEntityEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java new file mode 100644 -index 00000000..9efecaba +index 000000000..9efecabab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java @@ -0,0 +1,82 @@ @@ -93,5 +93,5 @@ index 00000000..9efecaba + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0112-Expand-Explosions-API.patch b/Spigot-API-Patches/0112-Expand-Explosions-API.patch index 3df46b6be..5ddc3eec0 100644 --- a/Spigot-API-Patches/0112-Expand-Explosions-API.patch +++ b/Spigot-API-Patches/0112-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From 20d2f3d94c812088dc301253d514cd1e2d4c198c Mon Sep 17 00:00:00 2001 +From 33a58559367c3aba8d13a3864bdc50ac08370bf8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:24:42 -0500 Subject: [PATCH] Expand Explosions API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Explosions API Add Entity as a Source capability, and add more API choices, and on Location. diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 4cf22afc..ac3c8eef 100644 +index 4cf22afc3..ac3c8eef5 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -7,6 +7,7 @@ import java.util.HashMap; @@ -106,7 +106,7 @@ index 4cf22afc..ac3c8eef 100644 * Returns a list of entities within a bounding box centered around a Location. * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 085c7a42..08985f77 100644 +index 085c7a42c..08985f77d 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1354,6 +1354,88 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -199,5 +199,5 @@ index 085c7a42..08985f77 100644 * Creates explosion at given coordinates with given power and optionally * setting blocks on fire or breaking blocks. -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch index ae3f3580b..7af970f42 100644 --- a/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch +++ b/Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch @@ -1,11 +1,11 @@ -From 974f48ac97eeaf72bded760309c0454758e766b6 Mon Sep 17 00:00:00 2001 +From 3a0213a42c48222049d43905151dae92adfd80a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 22 Jun 2018 22:59:18 -0400 Subject: [PATCH] ItemStack API additions for quantity/flags/lore diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java -index 7d2c5747..f2c3d2ac 100644 +index 125b74dd8..4940ba6a9 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -2,7 +2,9 @@ package org.bukkit.inventory; @@ -160,5 +160,5 @@ index 7d2c5747..f2c3d2ac 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch index acc070d54..23c29095a 100644 --- a/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-API-Patches/0114-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From 9758dc63e1ec45e75eae717081271ae78b16376c Mon Sep 17 00:00:00 2001 +From 2365cae4aeaef3a93d47852e7b3dd1eeeabd58f5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:19:19 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -51,5 +51,5 @@ index 896b1971c..4af8e680d 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0115-RangedEntity-API.patch b/Spigot-API-Patches/0115-RangedEntity-API.patch index 69f96c6d2..96062ed10 100644 --- a/Spigot-API-Patches/0115-RangedEntity-API.patch +++ b/Spigot-API-Patches/0115-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 2ed512e774f52c88a7f6364aea0912db3ca74585 Mon Sep 17 00:00:00 2001 +From d73f296bc9c8ec8389e3d97d1ab5ac721045b7a4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 21:34:40 -0400 Subject: [PATCH] RangedEntity API @@ -8,7 +8,7 @@ and to perform an attack. diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java new file mode 100644 -index 00000000..f2e3233a +index 000000000..f2e3233a3 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java @@ -0,0 +1,31 @@ @@ -44,7 +44,7 @@ index 00000000..f2e3233a + } +} diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java -index 7c92c431..14e6c5ee 100644 +index 7c92c431b..14e6c5ee0 100644 --- a/src/main/java/org/bukkit/entity/Illusioner.java +++ b/src/main/java/org/bukkit/entity/Illusioner.java @@ -1,6 +1,10 @@ @@ -60,7 +60,7 @@ index 7c92c431..14e6c5ee 100644 + +} diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java -index c4385429..d23226cc 100644 +index c43854298..d23226ccb 100644 --- a/src/main/java/org/bukkit/entity/Llama.java +++ b/src/main/java/org/bukkit/entity/Llama.java @@ -1,12 +1,13 @@ @@ -79,7 +79,7 @@ index c4385429..d23226cc 100644 /** * Represents the base color that the llama has. diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java -index 16b12938..1c367f78 100644 +index 16b129388..1c367f78e 100644 --- a/src/main/java/org/bukkit/entity/Skeleton.java +++ b/src/main/java/org/bukkit/entity/Skeleton.java @@ -2,11 +2,12 @@ package org.bukkit.entity; @@ -97,7 +97,7 @@ index 16b12938..1c367f78 100644 /** * Gets the current type of this skeleton. diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java -index 818efe2a..10f8f6d4 100644 +index 818efe2a4..10f8f6d45 100644 --- a/src/main/java/org/bukkit/entity/Snowman.java +++ b/src/main/java/org/bukkit/entity/Snowman.java @@ -1,9 +1,11 @@ @@ -114,7 +114,7 @@ index 818efe2a..10f8f6d4 100644 /** * Gets whether this snowman is in "derp mode", meaning it is not wearing a diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index b4343903..aa88aede 100644 +index b4343903b..aa88aede6 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -1,7 +1,9 @@ @@ -129,7 +129,7 @@ index b4343903..aa88aede 100644 +public interface Witch extends Raider, RangedEntity { // Paper } diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java -index 3bc332ee..426d3693 100644 +index 3bc332ee7..426d36933 100644 --- a/src/main/java/org/bukkit/entity/Wither.java +++ b/src/main/java/org/bukkit/entity/Wither.java @@ -1,7 +1,9 @@ @@ -144,5 +144,5 @@ index 3bc332ee..426d3693 100644 +public interface Wither extends Monster, Boss, RangedEntity { // Paper } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch index 04b072597..399a301e8 100644 --- a/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch +++ b/Spigot-API-Patches/0116-Add-World.getEntity-UUID-API.patch @@ -1,11 +1,11 @@ -From 10bd6dc72fcfcb78a94312284433cacafafdf334 Mon Sep 17 00:00:00 2001 +From a8e3517a9a0e8cffda4404490709e6904a08fbf4 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:07:16 +0200 Subject: [PATCH] Add World.getEntity(UUID) API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 08985f77..889756b1 100644 +index 08985f77d..889756b1c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -914,6 +914,17 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -27,5 +27,5 @@ index 08985f77..889756b1 100644 * Returns a list of entities within a bounding box centered around a * Location. -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch index 46f250cea..83fcc0f97 100644 --- a/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-API-Patches/0117-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 750045b5deeb830c3c24c0d4b61ac581bb972065 Mon Sep 17 00:00:00 2001 +From 9dd56c5585f21d0b8c82ca0b4989fa7eb31ad9f5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:52:52 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index cdbac95b..f25c7315 100644 +index cdbac95bb..f25c73155 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -152,6 +152,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder @@ -27,7 +27,7 @@ index cdbac95b..f25c7315 100644 * Returns the ItemStack currently in your hand, can be empty. * diff --git a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java -index 5861247c..21ad8888 100644 +index 5861247c1..21ad8888c 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryCloseEvent.java @@ -11,9 +11,60 @@ import org.jetbrains.annotations.NotNull; @@ -92,5 +92,5 @@ index 5861247c..21ad8888 100644 /** -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch index bbb63fd2e..b7df8ac01 100644 --- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From efac18b9f2572a808c18cd111e0468d9a3e4be52 Mon Sep 17 00:00:00 2001 +From f87949c1490fb4da1516c30a744806bc3769070e Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:25:48 -0400 Subject: [PATCH] Entity#getChunk API @@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index e2952209..a8dbf282 100644 +index e2952209d..a8dbf282d 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -3,6 +3,7 @@ package org.bukkit.entity; @@ -32,5 +32,5 @@ index e2952209..a8dbf282 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch index 8cde73200..fc0827b2c 100644 --- a/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch +++ b/Spigot-API-Patches/0119-Add-an-asterisk-to-legacy-API-plugins.patch @@ -1,4 +1,4 @@ -From 07223946c9a87d22119a29d15f7295f6151d23cd Mon Sep 17 00:00:00 2001 +From 859aa7959514bd7c7c6156727967c3382bb6573e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 19 Jul 2018 22:07:02 +0200 Subject: [PATCH] Add an asterisk to legacy API plugins @@ -7,7 +7,7 @@ Not here to name and shame, only so server admins can be aware of which plugins have and haven't been updated. diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index c0ff133d..82106426 100644 +index c0ff133de..821064264 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java @@ -83,5 +83,11 @@ public interface UnsafeValues { @@ -23,7 +23,7 @@ index c0ff133d..82106426 100644 // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java -index a1071e31..3dcecf3a 100644 +index a1071e317..3dcecf3a5 100644 --- a/src/main/java/org/bukkit/command/defaults/PluginsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/PluginsCommand.java @@ -59,7 +59,13 @@ public class PluginsCommand extends BukkitCommand { @@ -42,7 +42,7 @@ index a1071e31..3dcecf3a 100644 return "(" + plugins.size() + "): " + pluginList.toString(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 32ec68b4..8ff228ce 100644 +index 32ec68b48..8ff228ced 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -315,7 +315,14 @@ public final class JavaPluginLoader implements PluginLoader { @@ -62,5 +62,5 @@ index 32ec68b4..8ff228ce 100644 JavaPlugin jPlugin = (JavaPlugin) plugin; -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0120-EnderDragon-Events.patch b/Spigot-API-Patches/0120-EnderDragon-Events.patch index 4772b140a..aaae5c878 100644 --- a/Spigot-API-Patches/0120-EnderDragon-Events.patch +++ b/Spigot-API-Patches/0120-EnderDragon-Events.patch @@ -1,4 +1,4 @@ -From 068ee4ed588427a76c7ecdc4818e631ee2923da9 Mon Sep 17 00:00:00 2001 +From d0a0e23c72f948b3c7e07f48e73516b5c102253d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:05 -0500 Subject: [PATCH] EnderDragon Events @@ -6,7 +6,7 @@ Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java new file mode 100644 -index 00000000..118c7b67 +index 000000000..118c7b677 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFireballHitEvent.java @@ -0,0 +1,79 @@ @@ -91,7 +91,7 @@ index 00000000..118c7b67 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java new file mode 100644 -index 00000000..1915177f +index 000000000..1915177f4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonFlameEvent.java @@ -0,0 +1,61 @@ @@ -158,7 +158,7 @@ index 00000000..1915177f +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java new file mode 100644 -index 00000000..8414bd80 +index 000000000..8414bd805 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EnderDragonShootFireballEvent.java @@ -0,0 +1,61 @@ @@ -224,5 +224,5 @@ index 00000000..8414bd80 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch index 3c126ec36..423580fce 100644 --- a/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch +++ b/Spigot-API-Patches/0121-PlayerLaunchProjectileEvent.patch @@ -1,4 +1,4 @@ -From 98089eac14abfb2f9bf938b4c284e22bc6fb31b8 Mon Sep 17 00:00:00 2001 +From d5c86c51ddc1719c0e082c9511c566b5643f6e52 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:10:50 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java new file mode 100644 -index 00000000..9074b2ed +index 000000000..9074b2ede --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerLaunchProjectileEvent.java @@ -0,0 +1,83 @@ @@ -94,5 +94,5 @@ index 00000000..9074b2ed + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch index eac4c1f8a..bec174667 100644 --- a/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch +++ b/Spigot-API-Patches/0122-PlayerElytraBoostEvent.patch @@ -1,4 +1,4 @@ -From d0517b8b04774ee52135c914207d2ca44de462b6 Mon Sep 17 00:00:00 2001 +From 3dce11e6ed387ab8dde375eba3768eac4b62a396 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:53 -0500 Subject: [PATCH] PlayerElytraBoostEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java new file mode 100644 -index 00000000..e9a76a25 +index 000000000..e9a76a25f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerElytraBoostEvent.java @@ -0,0 +1,85 @@ @@ -96,5 +96,5 @@ index 00000000..e9a76a25 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0123-EntityTransformedEvent.patch b/Spigot-API-Patches/0123-EntityTransformedEvent.patch index 898e673d9..6abc5c416 100644 --- a/Spigot-API-Patches/0123-EntityTransformedEvent.patch +++ b/Spigot-API-Patches/0123-EntityTransformedEvent.patch @@ -1,4 +1,4 @@ -From 06ab69198621ccdff6afe2265068a02fe61838f6 Mon Sep 17 00:00:00 2001 +From 98308b2255a82eae37913639b9505bd99b72b53f Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:28:53 -0400 Subject: [PATCH] EntityTransformedEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java new file mode 100644 -index 00000000..12194f1f +index 000000000..12194f1fc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityTransformedEvent.java @@ -0,0 +1,92 @@ @@ -103,5 +103,5 @@ index 00000000..12194f1f + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch index c32780851..e80792b6f 100644 --- a/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-API-Patches/0124-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From d89438d8840b5f6d1a6e8cff20a8ab0f4b08e5ff Mon Sep 17 00:00:00 2001 +From a0334c3f2d894c40273a3e66f410feccb1ca4e0e Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:03 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index 6a854d7c..c8c08f1f 100644 +index 6a854d7cf..c8c08f1f2 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -308,5 +308,21 @@ public interface ArmorStand extends LivingEntity { @@ -31,5 +31,5 @@ index 6a854d7c..c8c08f1f 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch index e91ed6eae..5bdf64347 100644 --- a/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch +++ b/Spigot-API-Patches/0125-SkeletonHorse-Additions.patch @@ -1,4 +1,4 @@ -From e8ff87df3e458def0d73bd05a74d322be612ba89 Mon Sep 17 00:00:00 2001 +From a2f450f2aa73085fed9feeb9d6dc9989fc27c051 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:17 -0500 Subject: [PATCH] SkeletonHorse Additions @@ -6,7 +6,7 @@ Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java new file mode 100644 -index 00000000..d79dbcd6 +index 000000000..d79dbcd68 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SkeletonHorseTrapEvent.java @@ -0,0 +1,47 @@ @@ -58,7 +58,7 @@ index 00000000..d79dbcd6 +} + diff --git a/src/main/java/org/bukkit/entity/SkeletonHorse.java b/src/main/java/org/bukkit/entity/SkeletonHorse.java -index b2c6b6a8..ba998346 100644 +index b2c6b6a86..ba9983463 100644 --- a/src/main/java/org/bukkit/entity/SkeletonHorse.java +++ b/src/main/java/org/bukkit/entity/SkeletonHorse.java @@ -3,4 +3,12 @@ package org.bukkit.entity; @@ -76,5 +76,5 @@ index b2c6b6a8..ba998346 100644 + // Paper end +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch index 5f61d2869..9c8884d7e 100644 --- a/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch +++ b/Spigot-API-Patches/0126-Expand-Location-Manipulation-API.patch @@ -1,4 +1,4 @@ -From 184f233f8797a142cb47aba41a20d815de6a7264 Mon Sep 17 00:00:00 2001 +From f6826aa1119b3bb9869686340d6bd9ca0149162a Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 25 Jul 2018 01:36:07 -0400 Subject: [PATCH] Expand Location Manipulation API @@ -6,7 +6,7 @@ Subject: [PATCH] Expand Location Manipulation API Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z); diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index ac3c8eef..f87ecd0a 100644 +index ac3c8eef5..f87ecd0a7 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -546,6 +546,54 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -65,5 +65,5 @@ index ac3c8eef..f87ecd0a 100644 * @return A new location where X/Y/Z are on the Block location (integer value of X/Y/Z) */ -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch index 015d289d0..807bbd9cf 100644 --- a/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch +++ b/Spigot-API-Patches/0127-Expand-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From 6d256689d807852a6877064758b8c9d9d42beaaf Mon Sep 17 00:00:00 2001 +From 81e2600e41b4d0effec860a2b3bcc88079036a82 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:22:44 -0400 Subject: [PATCH] Expand ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java -index c8c08f1f..af70bac7 100644 +index c8c08f1f2..af70bac79 100644 --- a/src/main/java/org/bukkit/entity/ArmorStand.java +++ b/src/main/java/org/bukkit/entity/ArmorStand.java @@ -1,6 +1,7 @@ @@ -110,5 +110,5 @@ index c8c08f1f..af70bac7 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0128-AnvilDamageEvent.patch b/Spigot-API-Patches/0128-AnvilDamageEvent.patch index fcc5b3f3b..4d41e702b 100644 --- a/Spigot-API-Patches/0128-AnvilDamageEvent.patch +++ b/Spigot-API-Patches/0128-AnvilDamageEvent.patch @@ -1,4 +1,4 @@ -From a75e25aa2f87e441bce055f45716c5367b0e33f3 Mon Sep 17 00:00:00 2001 +From e80d7db6426808f73ae20e5cc2ef3e3badf9d617 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:36:55 -0500 Subject: [PATCH] AnvilDamageEvent @@ -6,7 +6,7 @@ Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java new file mode 100644 -index 00000000..a83c286c +index 000000000..a83c286c1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/AnvilDamagedEvent.java @@ -0,0 +1,148 @@ @@ -159,5 +159,5 @@ index 00000000..a83c286c + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch index 1d67dab56..1e32c3522 100644 --- a/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch +++ b/Spigot-API-Patches/0129-Remove-deadlock-risk-in-firing-async-events.patch @@ -1,4 +1,4 @@ -From 179b574da237b5a3f750a5ee373405322c5385f2 Mon Sep 17 00:00:00 2001 +From 76b6f38c7f71dac898238429577cea7214837cce Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 00:32:05 -0400 Subject: [PATCH] Remove deadlock risk in firing async events @@ -16,7 +16,7 @@ which results in a hard crash. This change removes the synchronize and adds some protection around enable/disable diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index a8dbf282..b4069dbf 100644 +index a8dbf282d..b4069dbf3 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; @@ -29,7 +29,7 @@ index a8dbf282..b4069dbf 100644 * * @return a new copy of Location containing the position of this entity diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 8bb24f73..8355f9f0 100644 +index 8bb24f734..8355f9f0e 100644 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java @@ -462,7 +462,7 @@ public final class SimplePluginManager implements PluginManager { @@ -97,7 +97,7 @@ index 8bb24f73..8355f9f0 100644 RegisteredListener[] listeners = handlers.getRegisteredListeners(); diff --git a/src/test/java/org/bukkit/plugin/PluginManagerTest.java b/src/test/java/org/bukkit/plugin/PluginManagerTest.java -index f188cd4f..1941c9f4 100644 +index f188cd4f3..1941c9f49 100644 --- a/src/test/java/org/bukkit/plugin/PluginManagerTest.java +++ b/src/test/java/org/bukkit/plugin/PluginManagerTest.java @@ -17,7 +17,7 @@ public class PluginManagerTest { @@ -136,5 +136,5 @@ index f188cd4f..1941c9f4 100644 @Test public void testRemovePermissionByNameLower() { -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch index 6394bedfe..4452764c9 100644 --- a/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch +++ b/Spigot-API-Patches/0130-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From 220d3a708bf84b7d69b8f6aaf1750de40fc40af1 Mon Sep 17 00:00:00 2001 +From 76cedcbfc0bd505fe0fea8a76545a8e93cc437ec Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:20 -0500 Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java -index 7f225baa..25bd8153 100644 +index 7f225baa9..25bd8153e 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEmptyEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -34,7 +34,7 @@ index 7f225baa..25bd8153 100644 @NotNull @Override diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java -index 0e4fa04e..1e0f7ee7 100644 +index 0e4fa04ea..1e0f7ee7d 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -98,7 +98,7 @@ index 0e4fa04e..1e0f7ee7 100644 public boolean isCancelled() { return cancelled; diff --git a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java -index 77c3a6e5..56f1cc2d 100644 +index 77c3a6e5c..56f1cc2d7 100644 --- a/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerBucketFillEvent.java @@ -5,6 +5,7 @@ import org.bukkit.block.Block; @@ -129,5 +129,5 @@ index 77c3a6e5..56f1cc2d 100644 @Override public HandlerList getHandlers() { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch index 5de7ce746..9b5925e95 100644 --- a/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch +++ b/Spigot-API-Patches/0131-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 709bb119e62b1a44c62bd9ea69f9035365cb2fc7 Mon Sep 17 00:00:00 2001 +From 809ca940b9fd8f5443c191773f75b96ffe05b0eb Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 15 Jul 2018 22:17:55 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java new file mode 100644 -index 00000000..73dabb82 +index 000000000..73dabb82c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/TNTPrimeEvent.java @@ -0,0 +1,114 @@ @@ -125,5 +125,5 @@ index 00000000..73dabb82 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch index e4aab0b4a..b25c30ea6 100644 --- a/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch +++ b/Spigot-API-Patches/0132-Provide-Chunk-Coordinates-as-a-Long-API.patch @@ -1,4 +1,4 @@ -From 71e820cd9199e5769916ef29cb8bfd68fccd6e69 Mon Sep 17 00:00:00 2001 +From 21d2ea6db9a32fce496f5c19f001cbdfdc66a8c2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 4 Aug 2018 19:37:35 -0400 Subject: [PATCH] Provide Chunk Coordinates as a Long API @@ -7,7 +7,7 @@ Allows you to easily access the chunks X/z as a long, and a method to look up by the long key too. diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 95e485ee..0bbef14a 100644 +index 95e485eea..0bbef14a9 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -27,6 +27,32 @@ public interface Chunk { @@ -44,7 +44,7 @@ index 95e485ee..0bbef14a 100644 * Gets the world containing this chunk * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 889756b1..e5b76d59 100644 +index 889756b1c..e5b76d59f 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -207,6 +207,22 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -71,5 +71,5 @@ index 889756b1..e5b76d59 100644 * Checks if the specified {@link Chunk} is loaded * -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0133-Async-Chunks-API.patch b/Spigot-API-Patches/0133-Async-Chunks-API.patch index af8d4eb70..e0867c479 100644 --- a/Spigot-API-Patches/0133-Async-Chunks-API.patch +++ b/Spigot-API-Patches/0133-Async-Chunks-API.patch @@ -1,4 +1,4 @@ -From 775e6d021b5fa6c80f2d2112ae78ffc3ad23a3ab Mon Sep 17 00:00:00 2001 +From ecbc7e47d76eba6915b81c86070e092349eb7d5b Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 17:43:33 -0600 Subject: [PATCH] Async Chunks API @@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously. Also adds utility methods to Entity to teleport asynchronously. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index e5b76d59..62aa9bd6 100644 +index e5b76d59f..62aa9bd67 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -221,6 +221,358 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -371,7 +371,7 @@ index e5b76d59..62aa9bd6 100644 /** diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index b4069dbf..45e0dffe 100644 +index b4069dbf3..45e0dffe6 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -155,6 +155,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -406,5 +406,5 @@ index b4069dbf..45e0dffe 100644 * Returns a list of entities within a bounding box centered around this * entity -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch index 0b17427b5..86103f79b 100644 --- a/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch +++ b/Spigot-API-Patches/0134-Make-EnderDragon-extend-Mob.patch @@ -1,11 +1,11 @@ -From 79d2dcccbb690008cb1dfa0ce57d2f8a36900496 Mon Sep 17 00:00:00 2001 +From 002e1330de5f20fae98f1cb6d818c0a1053d75bd Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 10 Aug 2018 22:08:34 -0400 Subject: [PATCH] Make EnderDragon extend Mob diff --git a/src/main/java/org/bukkit/entity/EnderDragon.java b/src/main/java/org/bukkit/entity/EnderDragon.java -index c14278d2..92da609f 100644 +index c14278d2c..92da609fb 100644 --- a/src/main/java/org/bukkit/entity/EnderDragon.java +++ b/src/main/java/org/bukkit/entity/EnderDragon.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.Nullable; @@ -18,5 +18,5 @@ index c14278d2..92da609f 100644 /** * Represents a phase or action that an Ender Dragon can perform. -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 4f91516b1..7790969df 100644 --- a/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-API-Patches/0135-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From ee8f4f1a0a6a9d3f20a4b1f4560ede1dbcb89116 Mon Sep 17 00:00:00 2001 +From 7e804838961e0fbee0a360a40d4f27cf1caf3ef4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:04:58 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/Chunk.java b/src/main/java/org/bukkit/Chunk.java -index 0bbef14a..11b691cf 100644 +index 0bbef14a9..11b691cf5 100644 --- a/src/main/java/org/bukkit/Chunk.java +++ b/src/main/java/org/bukkit/Chunk.java @@ -102,13 +102,26 @@ public interface Chunk { @@ -37,5 +37,5 @@ index 0bbef14a..11b691cf 100644 /** * Checks if the chunk is loaded. -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch index fb7c6e66b..e33771fda 100644 --- a/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch +++ b/Spigot-API-Patches/0136-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch @@ -1,11 +1,11 @@ -From 9d25b9ff0418113653a0ec9a3fde1280b7742f0f Mon Sep 17 00:00:00 2001 +From 5299bd10c554dafa755cac2640c176f301a4a246 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:19:37 -0400 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java -index ddaed812..203cda0f 100644 +index ddaed8127..203cda0f9 100644 --- a/src/main/java/co/aikar/timings/TimingHistory.java +++ b/src/main/java/co/aikar/timings/TimingHistory.java @@ -119,7 +119,7 @@ public class TimingHistory { @@ -18,5 +18,5 @@ index ddaed812..203cda0f 100644 Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ()); continue; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch index 388875006..f7391226b 100644 --- a/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch +++ b/Spigot-API-Patches/0137-Allow-Blocks-to-be-accessed-via-a-long-key.patch @@ -1,4 +1,4 @@ -From fdcc921f5d5f2e11ad8e37d016bb5e87016e0e10 Mon Sep 17 00:00:00 2001 +From 99aa3654f84764dd3c446a154bf4ad6d6f8107e4 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Aug 2018 21:42:10 -0700 Subject: [PATCH] Allow Blocks to be accessed via a long key @@ -18,7 +18,7 @@ Y range: [0, 1023] X, Z range: [-67 108 864, 67 108 863] diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index f87ecd0a..07e532cd 100644 +index f87ecd0a7..07e532cde 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -15,7 +15,6 @@ import org.jetbrains.annotations.Nullable; @@ -48,7 +48,7 @@ index f87ecd0a..07e532cd 100644 * @return A new location where X/Y/Z are the center of the block */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 62aa9bd6..64308c1f 100644 +index 62aa9bd67..64308c1f0 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -90,6 +90,38 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -91,7 +91,7 @@ index 62aa9bd6..64308c1f 100644 * Gets the highest non-empty (impassable) coordinate at the given * coordinates. diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index af4ffada..87185a81 100644 +index af4ffada0..87185a812 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -152,6 +152,72 @@ public interface Block extends Metadatable { @@ -168,5 +168,5 @@ index af4ffada..87185a81 100644 * Gets the Location of the block * -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch index 51c8b6f26..cf845ffc6 100644 --- a/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch +++ b/Spigot-API-Patches/0138-Slime-Pathfinder-Events.patch @@ -1,4 +1,4 @@ -From ecb8e3fef8742116a4ee2ae296cb96d7bd7bd7db Mon Sep 17 00:00:00 2001 +From f30264bb1ff8499182a99042f6d009794f7c654c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:27 -0500 Subject: [PATCH] Slime Pathfinder Events @@ -6,7 +6,7 @@ Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java new file mode 100644 -index 00000000..2638bbd3 +index 000000000..2638bbd3e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeChangeDirectionEvent.java @@ -0,0 +1,38 @@ @@ -50,7 +50,7 @@ index 00000000..2638bbd3 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java new file mode 100644 -index 00000000..14b67da1 +index 000000000..14b67da10 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimePathfindEvent.java @@ -0,0 +1,53 @@ @@ -109,7 +109,7 @@ index 00000000..14b67da1 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java new file mode 100644 -index 00000000..c8dd49d1 +index 000000000..c8dd49d11 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeSwimEvent.java @@ -0,0 +1,17 @@ @@ -132,7 +132,7 @@ index 00000000..c8dd49d1 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java new file mode 100644 -index 00000000..e9ba3279 +index 000000000..e9ba32799 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeTargetLivingEntityEvent.java @@ -0,0 +1,31 @@ @@ -169,7 +169,7 @@ index 00000000..e9ba3279 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java new file mode 100644 -index 00000000..4683a723 +index 000000000..4683a7237 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/SlimeWanderEvent.java @@ -0,0 +1,17 @@ @@ -191,7 +191,7 @@ index 00000000..4683a723 + } +} diff --git a/src/main/java/org/bukkit/entity/Slime.java b/src/main/java/org/bukkit/entity/Slime.java -index 1119e26e..c4791f95 100644 +index 1119e26e2..c4791f95d 100644 --- a/src/main/java/org/bukkit/entity/Slime.java +++ b/src/main/java/org/bukkit/entity/Slime.java @@ -14,4 +14,20 @@ public interface Slime extends Mob { @@ -216,5 +216,5 @@ index 1119e26e..c4791f95 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0139-isChunkGenerated-API.patch b/Spigot-API-Patches/0139-isChunkGenerated-API.patch index f8899c77c..52117d63b 100644 --- a/Spigot-API-Patches/0139-isChunkGenerated-API.patch +++ b/Spigot-API-Patches/0139-isChunkGenerated-API.patch @@ -1,11 +1,11 @@ -From 3d39d42557abe1eaab4544ad72fdfc5207b1ccf6 Mon Sep 17 00:00:00 2001 +From 6b081b6bfe90a151674b871c8bb100e2f6183aad Mon Sep 17 00:00:00 2001 From: cswhite2000 <18whitechristop@gmail.com> Date: Tue, 21 Aug 2018 19:39:46 -0700 Subject: [PATCH] isChunkGenerated API diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 07e532cd..6e1a1124 100644 +index 07e532cde..6e1a1124a 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -3,6 +3,7 @@ package org.bukkit; @@ -34,7 +34,7 @@ index 07e532cd..6e1a1124 100644 /** * Sets the position of this Location and returns itself diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 64308c1f..b7ad4f56 100644 +index 64308c1f0..b7ad4f566 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -254,6 +254,17 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -56,5 +56,5 @@ index 64308c1f..b7ad4f56 100644 * This is the Legacy API before Java 8 was supported. Java 8 Consumer is provided, * as well as future support -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch index a943b06f4..39dca593b 100644 --- a/Spigot-API-Patches/0140-Add-More-Creeper-API.patch +++ b/Spigot-API-Patches/0140-Add-More-Creeper-API.patch @@ -1,4 +1,4 @@ -From 6a721495ed80e20ab76fe910f0f76863f0edaec8 Mon Sep 17 00:00:00 2001 +From 6e45063b337b876bb23a49230ab2389bea6d1e7e Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:16 -0500 Subject: [PATCH] Add More Creeper API @@ -6,7 +6,7 @@ Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java new file mode 100644 -index 00000000..ff10251b +index 000000000..ff10251b6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/CreeperIgniteEvent.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 00000000..ff10251b + } +} diff --git a/src/main/java/org/bukkit/entity/Creeper.java b/src/main/java/org/bukkit/entity/Creeper.java -index 1b8ece6d..faaeb44a 100644 +index 1b8ece6df..faaeb44a9 100644 --- a/src/main/java/org/bukkit/entity/Creeper.java +++ b/src/main/java/org/bukkit/entity/Creeper.java @@ -71,4 +71,27 @@ public interface Creeper extends Monster { @@ -97,5 +97,5 @@ index 1b8ece6d..faaeb44a 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch index 737eeaf3e..4c5823e7a 100644 --- a/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-API-Patches/0141-Add-PhantomPreSpawnEvent.patch @@ -1,4 +1,4 @@ -From 5cf14e4f082f4a8bd55053a045f5e94640c76436 Mon Sep 17 00:00:00 2001 +From b6ff2c92913deb4a8612f65f21a4a065d81527f8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:42 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java new file mode 100644 -index 00000000..9022f697 +index 000000000..9022f697a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PhantomPreSpawnEvent.java @@ -0,0 +1,31 @@ @@ -42,7 +42,7 @@ index 00000000..9022f697 + } +} diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java -index 1a1044ed..ed4d417c 100644 +index 1a1044edc..ed4d417c2 100644 --- a/src/main/java/org/bukkit/entity/Phantom.java +++ b/src/main/java/org/bukkit/entity/Phantom.java @@ -1,5 +1,8 @@ @@ -70,5 +70,5 @@ index 1a1044ed..ed4d417c 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch index e34c831c7..7cf9406a0 100644 --- a/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch +++ b/Spigot-API-Patches/0142-Add-source-block-to-BlockPhysicsEvent.patch @@ -1,11 +1,11 @@ -From f19f62a22ecc44d92b5f0e3e2e85b40e686e3a44 Mon Sep 17 00:00:00 2001 +From 2af8c345ceb67410d7df03dba9fa9d566c2ab6f0 Mon Sep 17 00:00:00 2001 From: Sotr Date: Thu, 23 Aug 2018 16:14:25 +0800 Subject: [PATCH] Add source block to BlockPhysicsEvent diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java -index e3a5f582..c382f9fc 100644 +index e3a5f5824..c382f9fc2 100644 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java @@ -32,6 +32,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable { @@ -23,5 +23,5 @@ index e3a5f582..c382f9fc 100644 this(block, changed, block); } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch index 7c95f9f21..dfba35744 100644 --- a/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch +++ b/Spigot-API-Patches/0143-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From 95a43e8a08966b71f9c27280888bc7a60f551d39 Mon Sep 17 00:00:00 2001 +From 81bdb84ec777d5788fddec6b264cec11618b8533 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:06 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java -index 5a38d8f1..01fe217d 100644 +index 5a38d8f13..01fe217df 100644 --- a/src/main/java/org/bukkit/inventory/Inventory.java +++ b/src/main/java/org/bukkit/inventory/Inventory.java @@ -125,6 +125,34 @@ public interface Inventory extends Iterable { @@ -44,5 +44,5 @@ index 5a38d8f1..01fe217d 100644 * Returns all ItemStacks from the inventory * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch index a8cedab59..231a5abbf 100644 --- a/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-API-Patches/0144-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,4 +1,4 @@ -From 9fc1f2c6f1a03513613095a656e8b713d24ffe47 Mon Sep 17 00:00:00 2001 +From 8f319b7bea415a80ddbe07e91c4a82b9026b1ba8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:13:53 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java new file mode 100644 -index 00000000..18a96dbb +index 000000000..18a96dbb0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/TargetBlockInfo.java @@ -0,0 +1,54 @@ @@ -65,7 +65,7 @@ index 00000000..18a96dbb + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index d170149d..3110c385 100644 +index 4af8e680d..5e9ca6f3d 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -81,6 +81,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -147,5 +147,5 @@ index d170149d..3110c385 100644 * Gets the last two blocks along the living entity's line of sight. *

-- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0145-Improve-death-events.patch b/Spigot-API-Patches/0145-Improve-death-events.patch index 405b94082..fadffe064 100644 --- a/Spigot-API-Patches/0145-Improve-death-events.patch +++ b/Spigot-API-Patches/0145-Improve-death-events.patch @@ -1,4 +1,4 @@ -From c5a15df263aed995ea36ac14c7b9bfa0a8db5d08 Mon Sep 17 00:00:00 2001 +From a504a2b9273474de1c0ac1ac7b89d4a1b0fa00a7 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:32:28 +0100 Subject: [PATCH] Improve death events @@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using internal code. diff --git a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java -index a5984ab0..e19a3df9 100644 +index a5984ab06..e19a3df9a 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDeathEvent.java @@ -5,14 +5,24 @@ import org.bukkit.entity.LivingEntity; @@ -180,5 +180,5 @@ index a5984ab0..e19a3df9 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch index 9236cb87e..0abd523f5 100644 --- a/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch +++ b/Spigot-API-Patches/0146-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 8c61dbfb7e69abe9e11960cca8798a51e0fe13d2 Mon Sep 17 00:00:00 2001 +From d0971585476485723ada331a0498d6fff6aee347 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 12:39:06 -0400 Subject: [PATCH] Mob Pathfinding API @@ -13,7 +13,7 @@ You can use EntityPathfindEvent to cancel new pathfinds from overriding your cur diff --git a/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java new file mode 100644 -index 00000000..8b90a905 +index 000000000..8b90a9053 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/Pathfinder.java @@ -0,0 +1,170 @@ @@ -188,7 +188,7 @@ index 00000000..8b90a905 + } +} diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index 838440ff..afdc103f 100644 +index be9334a8b..b13228781 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -1,6 +1,7 @@ @@ -216,5 +216,5 @@ index 838440ff..afdc103f 100644 * Instructs this Mob to set the specified LivingEntity as its target. *

-- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch index 7dd7aeeb0..b553a3b45 100644 --- a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch @@ -1,11 +1,11 @@ -From e38ab8ea9596208adf8125bc2630a36480621435 Mon Sep 17 00:00:00 2001 +From f16a9bfce43f4131c8bdab8db59ca362134fb5b9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:01:54 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 2c6ff39e..7f771b35 100644 +index 43e191649..877ea4f32 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1947,6 +1947,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -36,5 +36,5 @@ index 2c6ff39e..7f771b35 100644 // Spigot start -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index 3b9ba8033..d73580ae6 100644 --- a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -1,4 +1,4 @@ -From c32da3b257eba8d2fd666e0b9fbb6826265441e3 Mon Sep 17 00:00:00 2001 +From d6d9d785dfd611f7ce87e64bb2bfa54f08277eb0 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:35 +0300 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values @@ -6,7 +6,7 @@ Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/com/destroystokyo/paper/Namespaced.java b/src/main/java/com/destroystokyo/paper/Namespaced.java new file mode 100644 -index 00000000..cd1a34b8 +index 000000000..cd1a34b82 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Namespaced.java @@ -0,0 +1,40 @@ @@ -52,7 +52,7 @@ index 00000000..cd1a34b8 +} diff --git a/src/main/java/com/destroystokyo/paper/NamespacedTag.java b/src/main/java/com/destroystokyo/paper/NamespacedTag.java new file mode 100644 -index 00000000..28f3fda9 +index 000000000..28f3fda95 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/NamespacedTag.java @@ -0,0 +1,142 @@ @@ -199,7 +199,7 @@ index 00000000..28f3fda9 + } +} diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 22eca2a1..620a962d 100644 +index 22eca2a18..620a962df 100644 --- a/src/main/java/org/bukkit/NamespacedKey.java +++ b/src/main/java/org/bukkit/NamespacedKey.java @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull; @@ -226,7 +226,7 @@ index 22eca2a1..620a962d 100644 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index f2e9f275..7e0b1d36 100644 +index f2e9f2753..7e0b1d363 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -388,4 +388,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste @@ -318,5 +318,5 @@ index f2e9f275..7e0b1d36 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch index 5ad437367..620954adb 100644 --- a/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch +++ b/Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch @@ -1,4 +1,4 @@ -From 84a87fd799e1ceaeedc4924323664331c6bd14b0 Mon Sep 17 00:00:00 2001 +From 1f6adca11910cc88f680825dbc964e7cdc249dfe Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 20:51:50 -0400 Subject: [PATCH] Performance & Concurrency Improvements to Permissions @@ -18,7 +18,7 @@ Optimized it to simply be a single get call cutting permission map lookups in half. diff --git a/src/main/java/org/bukkit/permissions/PermissibleBase.java b/src/main/java/org/bukkit/permissions/PermissibleBase.java -index 497775f7..c94e4cdb 100644 +index 497775f7f..c94e4cdb5 100644 --- a/src/main/java/org/bukkit/permissions/PermissibleBase.java +++ b/src/main/java/org/bukkit/permissions/PermissibleBase.java @@ -75,8 +75,11 @@ public class PermissibleBase implements Permissible { @@ -112,5 +112,5 @@ index 497775f7..c94e4cdb 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch index eeac1c3b4..e03864aa0 100644 --- a/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch +++ b/Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch @@ -1,4 +1,4 @@ -From 48d7033d5636f973e7c0866bf74610ac7aa22fd4 Mon Sep 17 00:00:00 2001 +From 3fda3c194e7401c8a71415625cd66b7c9fa8dbc1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 13 Sep 2018 21:39:26 -0400 Subject: [PATCH] Add ItemStackRecipeChoice Draft API @@ -9,7 +9,7 @@ Allows creating recipes that must match isSimilar to full item stack. diff --git a/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java new file mode 100644 -index 00000000..43e6576b +index 000000000..43e6576b1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/inventory/ItemStackRecipeChoice.java @@ -0,0 +1,51 @@ @@ -65,5 +65,5 @@ index 00000000..43e6576b + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch index cc71a5482..8ccdf77a9 100644 --- a/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 4a2dfd6dc85fd5e72a95c4bff2c08e81ffbf3ba7 Mon Sep 17 00:00:00 2001 +From b4bda8dc7d7aa8013a4ae0688e232564188bdf66 Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:01 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java -index c5a8c96f..9063cf37 100644 +index c5a8c96fa..9063cf370 100644 --- a/src/main/java/org/bukkit/block/Furnace.java +++ b/src/main/java/org/bukkit/block/Furnace.java @@ -61,6 +61,26 @@ public interface Furnace extends Container { @@ -37,5 +37,5 @@ index c5a8c96f..9063cf37 100644 @Override public FurnaceInventory getInventory(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch index 158ff2ebe..63f25b38c 100644 --- a/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch +++ b/Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From e5c7c371568b1dca84252ec87bc6c14933dc34d0 Mon Sep 17 00:00:00 2001 +From 57a505b782c36e3f017b9c7c31bc8187bb27a17b Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 18 Sep 2018 23:50:10 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -10,7 +10,7 @@ spawners. diff --git a/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java new file mode 100644 -index 00000000..48cff063 +index 000000000..48cff0635 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/PreSpawnerSpawnEvent.java @@ -0,0 +1,29 @@ @@ -44,5 +44,5 @@ index 00000000..48cff063 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch index e9ecd7ffe..cfccc5bf9 100644 --- a/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch +++ b/Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch @@ -1,4 +1,4 @@ -From 7bebab90baccc66d9abbb59bdd963bc9e13d02e1 Mon Sep 17 00:00:00 2001 +From 5b62e9e30d76547b6ce8093e48394f423523816d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 22 Sep 2018 18:41:01 -0400 Subject: [PATCH] Remove Precondition on name for AttributeModifier @@ -6,7 +6,7 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier Vanilla allows empty names diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java -index a9763147..f0dff145 100644 +index a97631474..f0dff145a 100644 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java @@ -32,10 +32,10 @@ public class AttributeModifier implements ConfigurationSerializable { @@ -23,5 +23,5 @@ index a9763147..f0dff145 100644 this.operation = operation; this.slot = slot; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch index 6c86fe16b..a8424c0e6 100644 --- a/Spigot-API-Patches/0154-Material-API-additions.patch +++ b/Spigot-API-Patches/0154-Material-API-additions.patch @@ -1,14 +1,14 @@ -From 7e722bdbd8f3b45278cb3a069b09aa82a50cceda Mon Sep 17 00:00:00 2001 +From 58de6a67866af196b860dcce47831eb71f05dd25 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Oct 2018 21:14:29 -0400 Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 9dc0ed03..535179c2 100644 +index f28da6efd..1f2dbd68c 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -81,6 +81,7 @@ import org.jetbrains.annotations.Nullable; +@@ -82,6 +82,7 @@ import org.jetbrains.annotations.Nullable; /** * An enum of all material IDs accepted by the official server and client */ @@ -16,7 +16,7 @@ index 9dc0ed03..535179c2 100644 public enum Material implements Keyed { // ACACIA_BOAT(27326, 1), -@@ -3305,6 +3306,22 @@ public enum Material implements Keyed { +@@ -3306,6 +3307,22 @@ public enum Material implements Keyed { } } @@ -40,5 +40,5 @@ index 9dc0ed03..535179c2 100644 * Do not use for any reason. * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0155-Add-Material-Tags.patch b/Spigot-API-Patches/0155-Add-Material-Tags.patch index fcefd9396..622fd4532 100644 --- a/Spigot-API-Patches/0155-Add-Material-Tags.patch +++ b/Spigot-API-Patches/0155-Add-Material-Tags.patch @@ -1,4 +1,4 @@ -From d0f5f71e226dd33834551fa47a3a4a605264647b Mon Sep 17 00:00:00 2001 +From 5fd4b315b2daa187f630169c76528a3e7731878e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 17 Jul 2018 01:27:15 -0400 Subject: [PATCH] Add Material Tags @@ -8,7 +8,7 @@ are related to each other by a trait. diff --git a/src/main/java/com/destroystokyo/paper/MaterialSetTag.java b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java new file mode 100644 -index 00000000..c91ea2a0 +index 000000000..c91ea2a06 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialSetTag.java @@ -0,0 +1,190 @@ @@ -204,7 +204,7 @@ index 00000000..c91ea2a0 +} diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java new file mode 100644 -index 00000000..88556fdb +index 000000000..88556fdb6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java @@ -0,0 +1,374 @@ @@ -584,7 +584,7 @@ index 00000000..88556fdb +} diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java new file mode 100644 -index 00000000..328c5147 +index 000000000..328c51471 --- /dev/null +++ b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java @@ -0,0 +1,25 @@ @@ -614,7 +614,7 @@ index 00000000..328c5147 + } +} diff --git a/src/test/java/org/bukkit/TestServer.java b/src/test/java/org/bukkit/TestServer.java -index 61993528..5f9d3482 100644 +index 61993528e..5f9d34824 100644 --- a/src/test/java/org/bukkit/TestServer.java +++ b/src/test/java/org/bukkit/TestServer.java @@ -29,6 +29,16 @@ public final class TestServer implements InvocationHandler { @@ -635,5 +635,5 @@ index 61993528..5f9d3482 100644 Server.class.getMethod("getPluginManager"), new MethodHandler() { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch index 89855fbf6..1b460d126 100644 --- a/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From 6e1384d706d338edc012cc11eb6b81a464c8e2f6 Mon Sep 17 00:00:00 2001 +From eb1540ebf1461127e32f7a4148cd8afc0e8aa8b8 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:09 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/org/bukkit/entity/Vex.java b/src/main/java/org/bukkit/entity/Vex.java -index 6b61c4ab..c34a3ea7 100644 +index 6b61c4ab7..c34a3ea7b 100644 --- a/src/main/java/org/bukkit/entity/Vex.java +++ b/src/main/java/org/bukkit/entity/Vex.java @@ -1,5 +1,7 @@ @@ -39,5 +39,5 @@ index 6b61c4ab..c34a3ea7 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch index f4f9ca336..a52173033 100644 --- a/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 23517bc468b2b7651e9672d2c6e91bcb6bed2106 Mon Sep 17 00:00:00 2001 +From 0061b2f5f623dd39ff2c0929ec86e8dfc779a5ce Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:32:53 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity @@ -6,7 +6,7 @@ Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java new file mode 100644 -index 00000000..f52644fa +index 000000000..f52644fab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/TargetEntityInfo.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 00000000..f52644fa + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 3110c385..240f276c 100644 +index 5e9ca6f3d..deab50525 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -150,6 +150,50 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource @@ -104,5 +104,5 @@ index 3110c385..240f276c 100644 /** -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0158-Add-sun-related-API.patch b/Spigot-API-Patches/0158-Add-sun-related-API.patch index 45fb150dc..b25922f36 100644 --- a/Spigot-API-Patches/0158-Add-sun-related-API.patch +++ b/Spigot-API-Patches/0158-Add-sun-related-API.patch @@ -1,11 +1,11 @@ -From 0889f7c87d88415878c52224204f17bcf12d4e83 Mon Sep 17 00:00:00 2001 +From af3b3f36b1bfd7b88dccbb63fb634f73292be1ed Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:15 -0500 Subject: [PATCH] Add sun related API diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index b7ad4f56..c88f1724 100644 +index b7ad4f566..c88f17244 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1646,6 +1646,16 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -26,7 +26,7 @@ index b7ad4f56..c88f1724 100644 * Returns whether the world has an ongoing storm. * diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java -index b1322878..d726453c 100644 +index b13228781..d726453c0 100644 --- a/src/main/java/org/bukkit/entity/Mob.java +++ b/src/main/java/org/bukkit/entity/Mob.java @@ -16,6 +16,13 @@ public interface Mob extends LivingEntity, Lootable { @@ -44,5 +44,5 @@ index b1322878..d726453c 100644 /** -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0159-Here-s-Johnny.patch b/Spigot-API-Patches/0159-Here-s-Johnny.patch index e126a2a7e..ff454f6fc 100644 --- a/Spigot-API-Patches/0159-Here-s-Johnny.patch +++ b/Spigot-API-Patches/0159-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 55e5b39866ee0b4122d18ccc260ea6c6fd14cb68 Mon Sep 17 00:00:00 2001 +From 45d90aea9327e590adfe6638ba2c1326f435e5f3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:16 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/org/bukkit/entity/Vindicator.java b/src/main/java/org/bukkit/entity/Vindicator.java -index b8ea68a8..c5d9e76a 100644 +index b8ea68a8f..c5d9e76a6 100644 --- a/src/main/java/org/bukkit/entity/Vindicator.java +++ b/src/main/java/org/bukkit/entity/Vindicator.java @@ -3,4 +3,30 @@ package org.bukkit.entity; @@ -41,5 +41,5 @@ index b8ea68a8..c5d9e76a 100644 + // Paper end +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0160-Turtle-API.patch b/Spigot-API-Patches/0160-Turtle-API.patch index e17fb6621..4c0255f8c 100644 --- a/Spigot-API-Patches/0160-Turtle-API.patch +++ b/Spigot-API-Patches/0160-Turtle-API.patch @@ -1,4 +1,4 @@ -From fb0f440061d118e2b2a67e4bef904a44e4606157 Mon Sep 17 00:00:00 2001 +From 6123dea51cf4a17b60b4788b4fb7c6101c6d93d2 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 28 Sep 2018 17:08:09 -0500 Subject: [PATCH] Turtle API @@ -6,7 +6,7 @@ Subject: [PATCH] Turtle API diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java new file mode 100644 -index 00000000..021356d1 +index 000000000..021356d15 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java @@ -0,0 +1,49 @@ @@ -61,7 +61,7 @@ index 00000000..021356d1 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java new file mode 100644 -index 00000000..a315c518 +index 000000000..a315c5185 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java @@ -0,0 +1,87 @@ @@ -154,7 +154,7 @@ index 00000000..a315c518 +} diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java new file mode 100644 -index 00000000..abeb24fc +index 000000000..abeb24fcc --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java @@ -0,0 +1,62 @@ @@ -221,7 +221,7 @@ index 00000000..abeb24fc + } +} diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java -index 0a4cd299..5375ea14 100644 +index 0a4cd2993..5375ea140 100644 --- a/src/main/java/org/bukkit/entity/Turtle.java +++ b/src/main/java/org/bukkit/entity/Turtle.java @@ -1,6 +1,55 @@ @@ -282,5 +282,5 @@ index 0a4cd299..5375ea14 100644 + // Paper end +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch index eeb36f19c..37ee79407 100644 --- a/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 1dbe5e0546a661b121c82a839d2f5b99fda98035 Mon Sep 17 00:00:00 2001 +From b586a727562b147c4456f3b38170d037ef0090ef Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:13 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/org/bukkit/entity/Item.java b/src/main/java/org/bukkit/entity/Item.java -index cb9e9f36..a15f70ff 100644 +index cb9e9f369..a15f70ff4 100644 --- a/src/main/java/org/bukkit/entity/Item.java +++ b/src/main/java/org/bukkit/entity/Item.java @@ -4,6 +4,10 @@ import org.bukkit.inventory.ItemStack; @@ -57,5 +57,5 @@ index cb9e9f36..a15f70ff 100644 // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0162-Add-spectator-target-events.patch b/Spigot-API-Patches/0162-Add-spectator-target-events.patch index 3c21fbed4..3da4e992a 100644 --- a/Spigot-API-Patches/0162-Add-spectator-target-events.patch +++ b/Spigot-API-Patches/0162-Add-spectator-target-events.patch @@ -1,4 +1,4 @@ -From 41a09f927d69e558a5dc223da54cc2a7ee8e39a1 Mon Sep 17 00:00:00 2001 +From 6d1e0775a1dc675aa0ff6a37d44599988bcef6cd Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:30:56 -0500 Subject: [PATCH] Add spectator target events @@ -8,7 +8,7 @@ Subject: [PATCH] Add spectator target events diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java new file mode 100644 -index 00000000..b8ec7ef2 +index 000000000..b8ec7ef2d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStartSpectatingEntityEvent.java @@ -0,0 +1,67 @@ @@ -81,7 +81,7 @@ index 00000000..b8ec7ef2 + diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java new file mode 100644 -index 00000000..693d119a +index 000000000..693d119ab --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerStopSpectatingEntityEvent.java @@ -0,0 +1,54 @@ @@ -140,5 +140,5 @@ index 00000000..693d119a + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0163-Add-more-Witch-API.patch b/Spigot-API-Patches/0163-Add-more-Witch-API.patch index 62d9f4ed6..63b0565ed 100644 --- a/Spigot-API-Patches/0163-Add-more-Witch-API.patch +++ b/Spigot-API-Patches/0163-Add-more-Witch-API.patch @@ -1,11 +1,11 @@ -From d4957c651a67e0bea676153a8d426681e9d43990 Mon Sep 17 00:00:00 2001 +From 39935bbe50ce4ad3af22bf448e7c125375791908 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 03:47:26 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java -index aa88aede..cd8d0a20 100644 +index aa88aede6..cd8d0a20e 100644 --- a/src/main/java/org/bukkit/entity/Witch.java +++ b/src/main/java/org/bukkit/entity/Witch.java @@ -2,8 +2,43 @@ package org.bukkit.entity; @@ -53,5 +53,5 @@ index aa88aede..cd8d0a20 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch index 262e4c84e..5f42e4c7b 100644 --- a/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch +++ b/Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch @@ -1,4 +1,4 @@ -From 18d4ca1294ed2c87e7bb040dcecdebabd6bfc4a6 Mon Sep 17 00:00:00 2001 +From cf9036d48345c80a7408cb639b4dd9924a2d1cdc Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:44:54 +0000 Subject: [PATCH] Make the default permission message configurable @@ -56,5 +56,5 @@ index 03bdc1622..0b0d1bd7c 100644 for (String line : permissionMessage.replace("", permission).split("\n")) { target.sendMessage(line); -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch index 58a266ebc..f175469ce 100644 --- a/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch +++ b/Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch @@ -1,4 +1,4 @@ -From 92e375b0ae0fbb4d606b7fee7132b646f824c52d Mon Sep 17 00:00:00 2001 +From 8410be584674d595e9083950b84c74e5f880383b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 15:53:43 +0000 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit @@ -21,7 +21,7 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java -index 963b9ead..a976c32d 100644 +index 963b9ead4..a976c32de 100644 --- a/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java +++ b/src/main/java/org/bukkit/event/vehicle/VehicleExitEvent.java @@ -13,10 +13,18 @@ public class VehicleExitEvent extends VehicleEvent implements Cancellable { @@ -64,7 +64,7 @@ index 963b9ead..a976c32d 100644 @Override public HandlerList getHandlers() { diff --git a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java -index 00d8ec81..a7632c8f 100644 +index 00d8ec81b..a7632c8f5 100644 --- a/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java +++ b/src/main/java/org/spigotmc/event/entity/EntityDismountEvent.java @@ -14,10 +14,19 @@ public class EntityDismountEvent extends EntityEvent implements Cancellable { @@ -108,5 +108,5 @@ index 00d8ec81..a7632c8f 100644 @Override public HandlerList getHandlers() { -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch index 8c11e7500..4d8584e09 100644 --- a/Spigot-API-Patches/0166-Add-more-Zombie-API.patch +++ b/Spigot-API-Patches/0166-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 390a6e71ac79020d4819cbcab004af43f7689d02 Mon Sep 17 00:00:00 2001 +From 418251eb02e5502ea67a1ec81d272732f910f2d9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:51 -0500 Subject: [PATCH] Add more Zombie API diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java -index 6dcac979..fa7a43c3 100644 +index 6dcac9798..fa7a43c35 100644 --- a/src/main/java/org/bukkit/entity/Zombie.java +++ b/src/main/java/org/bukkit/entity/Zombie.java @@ -86,4 +86,55 @@ public interface Zombie extends Monster { @@ -65,5 +65,5 @@ index 6dcac979..fa7a43c3 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch index 8889f9a67..a677bb568 100644 --- a/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch +++ b/Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch @@ -1,11 +1,11 @@ -From d05cfe5510c7b9bf9a59b7b1b01b28e598818d32 Mon Sep 17 00:00:00 2001 +From df4eaab94f97ac58b44fa6d70ddf40446f3ebfda Mon Sep 17 00:00:00 2001 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Date: Tue, 23 Oct 2018 19:32:55 +0300 Subject: [PATCH] Change the reserved channel check to be sensible diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java -index 1d061412..6fda7f3a 100644 +index 1d061412c..6fda7f3aa 100644 --- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java +++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java @@ -172,7 +172,7 @@ public class StandardMessenger implements Messenger { @@ -18,7 +18,7 @@ index 1d061412..6fda7f3a 100644 @Override diff --git a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java -index dce3d619..7e2335ed 100644 +index dce3d619a..7e2335ed8 100644 --- a/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java +++ b/src/test/java/org/bukkit/plugin/messaging/StandardMessengerTest.java @@ -25,8 +25,8 @@ public class StandardMessengerTest { @@ -33,5 +33,5 @@ index dce3d619..7e2335ed 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch index 026efdddb..8ffc48e0c 100644 --- a/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 95d30490448f23dea22036dc8cf2dcfe738143c2 Mon Sep 17 00:00:00 2001 +From 7ecfaaa46164249d829fbeaf66cfe8cd701168bc Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:06 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -35,7 +35,7 @@ is undefined. diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java new file mode 100644 -index 00000000..12c1c6fe +index 000000000..12c1c6fe9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerConnectionCloseEvent.java @@ -0,0 +1,95 @@ @@ -135,5 +135,5 @@ index 00000000..12c1c6fe + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index b7a1fce66..3f9b07803 100644 --- a/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From e1c6a27f1e758a693838a8a716cb5c89035636fa Mon Sep 17 00:00:00 2001 +From 2aef6859876204c739ce11f7da496d6e80c4ed24 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:31:12 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 222a9a7b..3ab914fb 100644 +index 222a9a7bf..3ab914fb2 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -146,7 +146,9 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @@ -61,5 +61,5 @@ index 222a9a7b..3ab914fb 100644 + } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0170-BlockDestroyEvent.patch b/Spigot-API-Patches/0170-BlockDestroyEvent.patch index 389dd7daa..e08e35f90 100644 --- a/Spigot-API-Patches/0170-BlockDestroyEvent.patch +++ b/Spigot-API-Patches/0170-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From b092cecdb21d7d793b27bdea3cd4a09cb2881b3d Mon Sep 17 00:00:00 2001 +From 9f28567e76a62262b1449dfd590d0d55846034ad Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:19:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -12,7 +12,7 @@ This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java new file mode 100644 -index 00000000..3aee12f1 +index 000000000..3aee12f1c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/block/BlockDestroyEvent.java @@ -0,0 +1,92 @@ @@ -109,5 +109,5 @@ index 00000000..3aee12f1 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch index 98f9f3342..d689cdf5a 100644 --- a/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch +++ b/Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch @@ -1,4 +1,4 @@ -From 920263b23cfbcb3a9a4d0a573361be12ac818318 Mon Sep 17 00:00:00 2001 +From 8c9cf7b20c507df56649dbdcd0d1507aeaaab208 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 28 Jan 2014 19:13:57 -0500 Subject: [PATCH] Add ItemStack Recipe API helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add ItemStack Recipe API helper methods Allows using ExactChoice Recipes with easier methodss diff --git a/src/main/java/org/bukkit/inventory/ShapedRecipe.java b/src/main/java/org/bukkit/inventory/ShapedRecipe.java -index d742c405..222a12ba 100644 +index d742c4058..222a12baa 100644 --- a/src/main/java/org/bukkit/inventory/ShapedRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapedRecipe.java @@ -145,6 +145,13 @@ public class ShapedRecipe implements Recipe, Keyed { @@ -24,7 +24,7 @@ index d742c405..222a12ba 100644 * Get a copy of the ingredients map. * diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java -index 84062dd7..ddcf84e6 100644 +index 84062dd71..ddcf84e66 100644 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java @@ -143,6 +143,40 @@ public class ShapelessRecipe implements Recipe, Keyed { @@ -69,5 +69,5 @@ index 84062dd7..ddcf84e6 100644 * Removes an ingredient from the list. * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch index dd11e4892..c731f590e 100644 --- a/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch +++ b/Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch @@ -1,4 +1,4 @@ -From aff15115615b56bf411d71d5bb34501c4bb48bcc Mon Sep 17 00:00:00 2001 +From 623dbef48ed38122b70f6233bacac6eca3ce5d3a Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:04:43 +0200 Subject: [PATCH] Add WhitelistToggleEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add WhitelistToggleEvent diff --git a/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java new file mode 100644 -index 00000000..fdd5eedb +index 000000000..fdd5eedb2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/WhitelistToggleEvent.java @@ -0,0 +1,40 @@ @@ -51,5 +51,5 @@ index 00000000..fdd5eedb + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0173-Annotation-Test-changes.patch b/Spigot-API-Patches/0173-Annotation-Test-changes.patch index f64bd9479..e41c086e5 100644 --- a/Spigot-API-Patches/0173-Annotation-Test-changes.patch +++ b/Spigot-API-Patches/0173-Annotation-Test-changes.patch @@ -1,11 +1,11 @@ -From 78ebc2fda46badc3e3b4a1e7145758fe80d43609 Mon Sep 17 00:00:00 2001 +From dd6fd5a88bcd591f5bd770a575ca7ea9d745ac4e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 17 Mar 2019 23:04:30 +0000 Subject: [PATCH] Annotation Test changes diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 0c737724..38be576b 100644 +index 0c7377247..38be576b3 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -40,7 +40,17 @@ public class AnnotationTest { @@ -28,5 +28,5 @@ index 0c737724..38be576b 100644 @Test -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch index e293c60b8..58a09489a 100644 --- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 42fc4b022ca608cf75b768be5569d073156087e0 Mon Sep 17 00:00:00 2001 +From edb98e617f2598261106ef474e0086a082f33422 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:21:23 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 45e0dffe..5518ecd2 100644 +index 45e0dffe6..5518ecd21 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -649,5 +649,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @@ -26,5 +26,5 @@ index 45e0dffe..5518ecd2 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch index 711081440..5114feaca 100644 --- a/Spigot-API-Patches/0175-Add-GS4-Query-event.patch +++ b/Spigot-API-Patches/0175-Add-GS4-Query-event.patch @@ -1,4 +1,4 @@ -From bf1cc0ed093a3faacca2e7f701fb6f0fa5396635 Mon Sep 17 00:00:00 2001 +From ea950c4c20b3979057656bc44eae306bbe176f42 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:27 +0200 Subject: [PATCH] Add GS4 Query event @@ -6,7 +6,7 @@ Subject: [PATCH] Add GS4 Query event diff --git a/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java new file mode 100644 -index 00000000..77a19995 +index 000000000..77a19995f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/GS4QueryEvent.java @@ -0,0 +1,412 @@ @@ -423,5 +423,5 @@ index 00000000..77a19995 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch index 56c172a58..447872e48 100644 --- a/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch +++ b/Spigot-API-Patches/0176-Add-PlayerPostRespawnEvent.patch @@ -1,4 +1,4 @@ -From 7a592cec03927827fbf2ab5025335b3750aeecb6 Mon Sep 17 00:00:00 2001 +From a90ff87559e325bf8f1ccc43abf89a5206dfc4e1 Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:33:13 -0700 Subject: [PATCH] Add PlayerPostRespawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerPostRespawnEvent diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java new file mode 100644 -index 00000000..31f34b54 +index 000000000..31f34b548 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java @@ -0,0 +1,52 @@ @@ -63,5 +63,5 @@ index 00000000..31f34b54 + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch index d99241905..34aeb33b5 100644 --- a/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch +++ b/Spigot-API-Patches/0177-Ignore-package-private-methods-for-nullability-annot.patch @@ -1,4 +1,4 @@ -From ac8062829a86c489fdd2cc70debe62b179b1034c Mon Sep 17 00:00:00 2001 +From 96c707d06d229797c278e27e906049cc374b5d6c Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:44:26 -0400 Subject: [PATCH] Ignore package-private methods for nullability annotations @@ -6,7 +6,7 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations This isn't API diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 38be576b..a48be38b 100644 +index 38be576b3..a48be38b1 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -162,7 +162,7 @@ public class AnnotationTest { @@ -19,5 +19,5 @@ index 38be576b..a48be38b 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch index acfa8cefb..96faafe7b 100644 --- a/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch +++ b/Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch @@ -1,4 +1,4 @@ -From 6fadd84858ccbd8bd4a4416fb45fd4a3b4ba8fc3 Mon Sep 17 00:00:00 2001 +From 107a95f0ecc9a61d25374493249ba6503c54dbd9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:39:01 -0400 Subject: [PATCH] Flip some Spigot API null annotations @@ -126,5 +126,5 @@ index 4940ba6a9..d7d6a3e83 100644 return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone(); } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0179-Server-Tick-Events.patch b/Spigot-API-Patches/0179-Server-Tick-Events.patch index e1d83d378..1da7eeaa8 100644 --- a/Spigot-API-Patches/0179-Server-Tick-Events.patch +++ b/Spigot-API-Patches/0179-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 9ead8f3285ae8c2f39563a8189bada2f38876e48 Mon Sep 17 00:00:00 2001 +From 55c0625f5bb4e6bd0014de4f5d573ab7f21c67b3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 21:58:55 -0400 Subject: [PATCH] Server Tick Events @@ -7,7 +7,7 @@ Fires event at start and end of a server tick diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java new file mode 100644 -index 00000000..9fd28e03 +index 000000000..9fd28e036 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickEndEvent.java @@ -0,0 +1,59 @@ @@ -72,7 +72,7 @@ index 00000000..9fd28e03 +} diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java new file mode 100644 -index 00000000..eac85f1f +index 000000000..eac85f1f4 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/server/ServerTickStartEvent.java @@ -0,0 +1,32 @@ @@ -109,5 +109,5 @@ index 00000000..eac85f1f + } +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch index c2fa51703..6bb672755 100644 --- a/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch +++ b/Spigot-API-Patches/0180-PlayerDeathEvent-getItemsToKeep.patch @@ -1,4 +1,4 @@ -From 90ee83866858a8d71451b57c18653ce6d56ec2a4 Mon Sep 17 00:00:00 2001 +From ba8965617fb38e13d96b70788a7f0351f8665298 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 11 Mar 2013 20:04:34 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index 07a52441..1e97d04b 100644 +index 07a52441a..1e97d04b3 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -17,6 +17,40 @@ public class PlayerDeathEvent extends EntityDeathEvent { @@ -53,5 +53,5 @@ index 07a52441..1e97d04b 100644 this(player, drops, droppedExp, 0, deathMessage); } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0181-Add-Heightmap-API.patch b/Spigot-API-Patches/0181-Add-Heightmap-API.patch index 81707a31d..7c2077824 100644 --- a/Spigot-API-Patches/0181-Add-Heightmap-API.patch +++ b/Spigot-API-Patches/0181-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From ea93c9776bf204f612644a53d96fb4d64607baff Mon Sep 17 00:00:00 2001 +From 358e052ad2b5e5e3cb119d36f8558332bb5cb1e7 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Dec 2018 19:00:36 -0800 Subject: [PATCH] Add Heightmap API @@ -7,7 +7,7 @@ Deprecated 2020-02-08 MC 1.15.2 diff --git a/src/main/java/com/destroystokyo/paper/HeightmapType.java b/src/main/java/com/destroystokyo/paper/HeightmapType.java new file mode 100644 -index 00000000..709e44ea +index 000000000..709e44ea1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/HeightmapType.java @@ -0,0 +1,39 @@ @@ -51,7 +51,7 @@ index 00000000..709e44ea + SOLID_OR_LIQUID_NO_LEAVES; +} diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 77d9cd0a..59047503 100644 +index 77d9cd0a1..590475032 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -638,6 +638,33 @@ public class Location implements Cloneable, ConfigurationSerializable { @@ -89,7 +89,7 @@ index 77d9cd0a..59047503 100644 * Creates explosion at this location with given power * diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index c88f1724..db18f70e 100644 +index c88f17244..db18f70ec 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -160,6 +160,87 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -181,5 +181,5 @@ index c88f1724..db18f70e 100644 * Gets the highest coordinate corresponding to the {@link HeightMap} at the * given coordinates. -- -2.26.0 +2.25.1 diff --git a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch index ea72c1531..142b8b10e 100644 --- a/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-API-Patches/0182-Mob-Spawner-API-Enhancements.patch @@ -1,11 +1,11 @@ -From d5a5de22dce06c0d7a62b347c1af562ae7d454aa Mon Sep 17 00:00:00 2001 +From f8f78c28755f27cccab9be2d2ba6000ee6016e2a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:19 -0500 Subject: [PATCH] Mob Spawner API Enhancements diff --git a/src/main/java/org/bukkit/block/CreatureSpawner.java b/src/main/java/org/bukkit/block/CreatureSpawner.java -index cb447a4a..35a599eb 100644 +index cb447a4ad..35a599ebe 100644 --- a/src/main/java/org/bukkit/block/CreatureSpawner.java +++ b/src/main/java/org/bukkit/block/CreatureSpawner.java @@ -199,4 +199,18 @@ public interface CreatureSpawner extends TileState { @@ -28,5 +28,5 @@ index cb447a4a..35a599eb 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch index 3ae3d6db9..b0cfcf11d 100644 --- a/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch +++ b/Spigot-API-Patches/0183-Add-BlockSoundGroup-interface.patch @@ -1,4 +1,4 @@ -From 236a9fac537404b947a85a76ded73bbd9031a915 Mon Sep 17 00:00:00 2001 +From 9e6a8a22c7595adef9fe13fe4849abc0ae937f00 Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:41:28 -0700 Subject: [PATCH] Add BlockSoundGroup interface @@ -7,7 +7,7 @@ This PR adds the getSoundGroup() method in Block which returns a BlockSoundGroup diff --git a/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java new file mode 100644 -index 00000000..8cf87d22 +index 000000000..8cf87d228 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/BlockSoundGroup.java @@ -0,0 +1,52 @@ @@ -64,7 +64,7 @@ index 00000000..8cf87d22 + Sound getFallSound(); +} diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 87185a81..038de5a6 100644 +index 87185a812..038de5a64 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -1,6 +1,7 @@ @@ -93,5 +93,5 @@ index 87185a81..038de5a6 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch index f1e891a72..d4207efdf 100644 --- a/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch +++ b/Spigot-API-Patches/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch @@ -1,11 +1,11 @@ -From 54ca16e5e62b0dc6b5b8ba1c3eec75cba8faabd5 Mon Sep 17 00:00:00 2001 +From c8ae0845a779a94befaec9e77421948b612a47fa Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Thu, 11 Jul 2019 10:35:56 -0700 Subject: [PATCH] Amend PlayerInteractAtEntityEvent javadoc for ArmorStands diff --git a/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java b/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java -index 1075dbb8..3f24d302 100644 +index 1075dbb81..3f24d302e 100644 --- a/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerInteractAtEntityEvent.java @@ -13,6 +13,9 @@ import org.jetbrains.annotations.NotNull; @@ -19,5 +19,5 @@ index 1075dbb8..3f24d302 100644 public class PlayerInteractAtEntityEvent extends PlayerInteractEntityEvent { private static final HandlerList handlers = new HandlerList(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch b/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch index a2a49e88a..758ea1570 100644 --- a/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch +++ b/Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch @@ -1,4 +1,4 @@ -From ed28e81070e65d81b3033caf1f2ad6399194f63f Mon Sep 17 00:00:00 2001 +From 0726ea2828fb2a6d9eb5547abf7a71f5fc101c56 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Oct 2019 21:24:28 -0500 Subject: [PATCH] Name the specific custom world gen plugin class that throws a @@ -22,5 +22,5 @@ index 70f20fb64..59138238b 100644 /** -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch b/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch index 1a6aba2f9..179ab293b 100644 --- a/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch +++ b/Spigot-API-Patches/0186-Increase-custom-payload-channel-message-size.patch @@ -1,4 +1,4 @@ -From cbc7f9e4c9ec7b585261a98c14939270f394f8f3 Mon Sep 17 00:00:00 2001 +From 85a5ffd84b59580bcbdc8d4dd77e09c25c22527a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 18 Oct 2019 17:39:05 +0100 Subject: [PATCH] Increase custom payload channel message size @@ -7,7 +7,7 @@ Doubles the custom payload size limit imposed by bukkit, also creates a system property to allow customizing the size `paper.maxCustomChannelName` diff --git a/src/main/java/org/bukkit/plugin/messaging/Messenger.java b/src/main/java/org/bukkit/plugin/messaging/Messenger.java -index ea9b525f..682c7718 100644 +index ea9b525ff..682c77188 100644 --- a/src/main/java/org/bukkit/plugin/messaging/Messenger.java +++ b/src/main/java/org/bukkit/plugin/messaging/Messenger.java @@ -24,7 +24,7 @@ public interface Messenger { @@ -20,5 +20,5 @@ index ea9b525f..682c7718 100644 /** * Checks if the specified channel is a reserved name. -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch index b415f2618..40b1c70d9 100644 --- a/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch +++ b/Spigot-API-Patches/0187-Expose-the-internal-current-tick.patch @@ -1,4 +1,4 @@ -From 569ba281bef21cef40ff1faad235ab965fc48522 Mon Sep 17 00:00:00 2001 +From 43f32b7a054b807b1157fd262e2e733e90a1feab Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 20 Apr 2019 19:47:29 -0500 Subject: [PATCH] Expose the internal current tick @@ -37,5 +37,5 @@ index df37b9ee5..80f9abdca 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch index 03797fb44..32ff10341 100644 --- a/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-API-Patches/0188-PlayerDeathEvent-shouldDropExperience.patch @@ -1,11 +1,11 @@ -From aebd26ded7622ed404a7ee216378447a6e16a106 Mon Sep 17 00:00:00 2001 +From d235514ac508b4294b8f6d63fef1ade88f5dfa3e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 24 Dec 2019 00:35:31 +0000 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java -index 1e97d04b..3a743430 100644 +index 1e97d04b3..3a743430a 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -1,6 +1,8 @@ @@ -60,5 +60,5 @@ index 1e97d04b..3a743430 100644 @NotNull -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch index 6f1641b0f..2e5f934bf 100644 --- a/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch +++ b/Spigot-API-Patches/0189-Add-effect-to-block-break-naturally.patch @@ -1,11 +1,11 @@ -From dde41eab315a4b6cce19b82218b31a5fb5a069ee Mon Sep 17 00:00:00 2001 +From 160736080a091b569fe39f90e90d3d6b6afdb850 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 12:25:16 -0600 Subject: [PATCH] Add effect to block break naturally diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 038de5a6..a14a7583 100644 +index 038de5a64..a14a75834 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -467,6 +467,18 @@ public interface Block extends Metadatable { @@ -28,5 +28,5 @@ index 038de5a6..a14a7583 100644 * Returns a list of items which would drop by destroying this block * -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch b/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch index c9bee9aaf..8ec7fb479 100644 --- a/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch +++ b/Spigot-API-Patches/0190-Add-ThrownEggHatchEvent.patch @@ -1,4 +1,4 @@ -From 66c2aa84c68e3ec3fa0a0f952df4ca94ab3b8d34 Mon Sep 17 00:00:00 2001 +From 846303604626907a77c402f34b60da5e1e19ace1 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 9 Feb 2020 00:19:08 -0600 Subject: [PATCH] Add ThrownEggHatchEvent @@ -8,7 +8,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java new file mode 100644 -index 00000000..085d77dd +index 000000000..085d77dde --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/entity/ThrownEggHatchEvent.java @@ -0,0 +1,115 @@ @@ -128,5 +128,5 @@ index 00000000..085d77dd + } +} -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0191-Entity-Jump-API.patch b/Spigot-API-Patches/0191-Entity-Jump-API.patch index 80b023344..3f722c97f 100644 --- a/Spigot-API-Patches/0191-Entity-Jump-API.patch +++ b/Spigot-API-Patches/0191-Entity-Jump-API.patch @@ -1,4 +1,4 @@ -From 2fc6fd345f199b0d123147ca13d441b86156c121 Mon Sep 17 00:00:00 2001 +From 4f7f47c7b6de91c1101b33bf94e221cfc162b145 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Feb 2020 23:26:18 -0600 Subject: [PATCH] Entity Jump API @@ -87,5 +87,5 @@ index deab50525..7f73e4b92 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch index 34f3fa264..f09092dc0 100644 --- a/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch +++ b/Spigot-API-Patches/0192-add-hand-to-BlockMultiPlaceEvent.patch @@ -1,4 +1,4 @@ -From eeb73f0f817591d7385cc0db9bcc91e7b800f1f9 Mon Sep 17 00:00:00 2001 +From 4491e720453f87bffe6259822f7e23b07d708cb4 Mon Sep 17 00:00:00 2001 From: Trigary Date: Sun, 1 Mar 2020 22:43:34 +0100 Subject: [PATCH] add hand to BlockMultiPlaceEvent @@ -28,5 +28,5 @@ index fe2ec79dd..8460aa4f5 100644 /** -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0001-POM-Changes.patch b/Spigot-Server-Patches/0001-POM-Changes.patch index fdce9a3f3..2e91d6905 100644 --- a/Spigot-Server-Patches/0001-POM-Changes.patch +++ b/Spigot-Server-Patches/0001-POM-Changes.patch @@ -1,11 +1,11 @@ -From 32ee60c7eaad2eb1fa2b83ba68b3268ac3de955b Mon Sep 17 00:00:00 2001 +From c9716ffd01bb1c07e57fdb1e3f5da315ce435605 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 20:40:33 -0600 Subject: [PATCH] POM Changes diff --git a/pom.xml b/pom.xml -index def28b3be..3dc6c2a3f 100644 +index def28b3bec..3dc6c2a3f5 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ @@ -146,7 +146,7 @@ index def28b3be..3dc6c2a3f 100644 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 93046379d..674096cab 100644 +index 93046379d0..674096cab1 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -159,5 +159,5 @@ index 93046379d..674096cab 100644 if (stream != null) { -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0002-Paper-config-files.patch b/Spigot-Server-Patches/0002-Paper-config-files.patch index a0eac40bf..ef2aec33e 100644 --- a/Spigot-Server-Patches/0002-Paper-config-files.patch +++ b/Spigot-Server-Patches/0002-Paper-config-files.patch @@ -1,4 +1,4 @@ -From 8f849e950e96e48bf06a93f787265c4e66db48a1 Mon Sep 17 00:00:00 2001 +From cddfa4ac80d6d4cdf01a1bea0bda766e30caa8c0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 21:02:09 -0600 Subject: [PATCH] Paper config files @@ -6,7 +6,7 @@ Subject: [PATCH] Paper config files diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java new file mode 100644 -index 000000000..41c79650b +index 0000000000..41c79650b1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -0,0 +1,256 @@ @@ -268,7 +268,7 @@ index 000000000..41c79650b +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java new file mode 100644 -index 000000000..273cdb598 +index 0000000000..273cdb598b --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -0,0 +1,184 @@ @@ -458,7 +458,7 @@ index 000000000..273cdb598 +} diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java new file mode 100644 -index 000000000..a73865739 +index 0000000000..a738657394 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -0,0 +1,67 @@ @@ -530,7 +530,7 @@ index 000000000..a73865739 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 41eac3588..32c496fa8 100644 +index 41eac3588e..32c496fa88 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -260,15 +260,15 @@ public class ChunkProviderServer extends IChunkProvider { @@ -554,7 +554,7 @@ index 41eac3588..32c496fa8 100644 } diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 136d1b50f..9eed98e37 100644 +index 136d1b50f1..9eed98e379 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -170,6 +170,15 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -574,7 +574,7 @@ index 136d1b50f..9eed98e37 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 4b90ee6ef..8789191fe 100644 +index 4b90ee6ef5..8789191fe6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -135,9 +135,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener { @@ -591,7 +591,7 @@ index 4b90ee6ef..8789191fe 100644 public long aa; public long ab; diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index ddca89a13..f937b7294 100644 +index ddca89a132..f937b72945 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -3,6 +3,7 @@ package net.minecraft.server; @@ -614,7 +614,7 @@ index ddca89a13..f937b7294 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 487346ce8..177e2af68 100644 +index 487346ce8c..177e2af68d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -70,6 +70,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -635,7 +635,7 @@ index 487346ce8..177e2af68 100644 this.world = new CraftWorld((WorldServer) this, gen, env); this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 02364e3c3..8d1f066f0 100644 +index 02364e3c32..8d1f066f00 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -769,6 +769,7 @@ public final class CraftServer implements Server { @@ -699,7 +699,7 @@ index 02364e3c3..8d1f066f0 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 7d9a1851d..0d8668d34 100644 +index 7d9a1851d7..0d8668d34d 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -129,6 +129,14 @@ public class Main { @@ -718,7 +718,7 @@ index 7d9a1851d..0d8668d34 100644 }; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 5597d4100..4965a48c3 100644 +index 5597d41005..4965a48c30 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -39,36 +39,36 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch index c26a7f973..a9e1bcd34 100644 --- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch +++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch @@ -1,4 +1,4 @@ -From 01161a76c5123a08b7eade5ab1aaf8ad24c97bc7 Mon Sep 17 00:00:00 2001 +From 29db27ff694ef581b57ddb68fb6ff50f9a171818 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 30 Mar 2016 19:36:20 -0400 Subject: [PATCH] MC Dev fixes @@ -713,5 +713,5 @@ index 55fe7625af..19e68a7831 100644 t0.a(nbttagcompound.getCompound("data")); -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0004-MC-Utils.patch b/Spigot-Server-Patches/0004-MC-Utils.patch index 3d434e22e..b73c2b245 100644 --- a/Spigot-Server-Patches/0004-MC-Utils.patch +++ b/Spigot-Server-Patches/0004-MC-Utils.patch @@ -1,4 +1,4 @@ -From 39fe4c93947820526f380f39715181ba25f3996e Mon Sep 17 00:00:00 2001 +From fa6723b00dd09c3e2d8f382abd55578f7a38efd9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:55:47 -0400 Subject: [PATCH] MC Utils @@ -1851,7 +1851,7 @@ index 260644bf0b..f2a19acd84 100644 } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 41eac3588e..a5f2468a66 100644 +index 32c496fa88..2b0ad4226e 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -23,7 +23,7 @@ public class ChunkProviderServer extends IChunkProvider { diff --git a/Spigot-Server-Patches/0005-Paper-Metrics.patch b/Spigot-Server-Patches/0005-Paper-Metrics.patch index a84ddde96..9457ffac2 100644 --- a/Spigot-Server-Patches/0005-Paper-Metrics.patch +++ b/Spigot-Server-Patches/0005-Paper-Metrics.patch @@ -1,4 +1,4 @@ -From bc14be639bd19de94d8f562b0f520eff6210415d Mon Sep 17 00:00:00 2001 +From e8c6717019fe0c867ff3393920b199bc2d3e2775 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 24 Mar 2017 23:56:01 -0500 Subject: [PATCH] Paper Metrics @@ -15,7 +15,7 @@ decisions on behalf of the project. diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java new file mode 100644 -index 000000000..e257d6b36 +index 0000000000..e257d6b36e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -0,0 +1,627 @@ @@ -647,7 +647,7 @@ index 000000000..e257d6b36 + } +} diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 273cdb598..b6d470e59 100644 +index 273cdb598b..b6d470e594 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -41,6 +41,7 @@ public class PaperConfig { @@ -671,7 +671,7 @@ index 273cdb598..b6d470e59 100644 static void readConfig(Class clazz, Object instance) { diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index ff1ddfcfe..fdca34346 100644 +index ff1ddfcfe0..fdca34346a 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -83,6 +83,7 @@ public class SpigotConfig @@ -691,5 +691,5 @@ index ff1ddfcfe..fdca34346 100644 static void readConfig(Class clazz, Object instance) -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch index 22addbea7..c7ab90879 100644 --- a/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch +++ b/Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch @@ -1,4 +1,4 @@ -From 67f22b9c0a3cfa5f35bbefd0634acb29759cb809 Mon Sep 17 00:00:00 2001 +From f7532f84ba9e383d53cbca1ea5cedafc603e131f Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 01:40:13 -0400 Subject: [PATCH] Add MinecraftKey Information to Objects @@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects Stores the reference to the objects respective MinecraftKey diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 3392ed13f..d2c325050 100644 +index 41c79650b1..b839769cea 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -178,7 +178,7 @@ public class PaperCommand extends Command { @@ -19,7 +19,7 @@ index 3392ed13f..d2c325050 100644 MutablePair> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap())); ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ()); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8789191fe..7899fd6d8 100644 +index 8789191fe6..7899fd6d88 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent; @@ -65,7 +65,7 @@ index 8789191fe..7899fd6d8 100644 protected abstract void a(NBTTagCompound nbttagcompound); diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java -index cbf0c2f25..79f854966 100644 +index cbf0c2f25d..79f8549660 100644 --- a/src/main/java/net/minecraft/server/EntityTypes.java +++ b/src/main/java/net/minecraft/server/EntityTypes.java @@ -237,6 +237,7 @@ public class EntityTypes { @@ -78,7 +78,7 @@ index cbf0c2f25..79f854966 100644 } diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java new file mode 100644 -index 000000000..743142d03 +index 0000000000..743142d030 --- /dev/null +++ b/src/main/java/net/minecraft/server/KeyedObject.java @@ -0,0 +1,9 @@ @@ -92,7 +92,7 @@ index 000000000..743142d03 + } +} diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 40752f761..9071bb7ec 100644 +index 40752f7617..9071bb7ece 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.InventoryHolder; diff --git a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch index 97fd43a57..65d996fdc 100644 --- a/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch +++ b/Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch @@ -1,4 +1,4 @@ -From 883a5600646deb5a98c33313a92d02625f07d30c Mon Sep 17 00:00:00 2001 +From 3cf32449e02bb6944e4ec14734cbc3f96f2e3168 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:10:36 -0400 Subject: [PATCH] Store reference to current Chunk for Entity and Block diff --git a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch index c874bcb32..e2fdc80bb 100644 --- a/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch +++ b/Spigot-Server-Patches/0008-Store-counts-for-each-Entity-Block-Entity-Type.patch @@ -1,4 +1,4 @@ -From 9cb17cf35fc80ec87379bcb8dcce5a034aa536e8 Mon Sep 17 00:00:00 2001 +From 89510d05fbcf1bfad15bd021c056c3822a5f9c88 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:13:59 -0400 Subject: [PATCH] Store counts for each Entity/Block Entity Type @@ -6,7 +6,7 @@ Subject: [PATCH] Store counts for each Entity/Block Entity Type Opens door for future patches to optimize performance diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 02b142fe8..e58dd3e6d 100644 +index 02b142fe8b..e58dd3e6df 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -56,15 +56,19 @@ public class Chunk implements IChunkAccess { @@ -54,5 +54,5 @@ index 02b142fe8..e58dd3e6d 100644 this.entities.remove(entity); // Paper } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index d5573107b..0ec01a75e 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From df62772a53a003d63c7eaf493ddfa13d5d3bba54 Mon Sep 17 00:00:00 2001 +From 146ed9c1216777939f052fb120024009886883e6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -634,7 +634,7 @@ index 9eed98e379..d6646d7e61 100644 } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d2cfc65513..74a4bf9c5c 100644 +index 2890e8121d..e9d0a4eb90 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender; @@ -1849,5 +1849,5 @@ index ca7789b5e0..4423839697 100644 } } -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch index 8bd547111..38c22f368 100644 --- a/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch +++ b/Spigot-Server-Patches/0010-Configurable-cactus-and-reed-natural-growth-heights.patch @@ -1,11 +1,11 @@ -From 0b9dc837fc1abb6f576c48421e4fc7db4bc8f5d9 Mon Sep 17 00:00:00 2001 +From 4b9d15b9bd6a74705231f2646a99cf8bedb30fc6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:02:51 -0600 Subject: [PATCH] Configurable cactus and reed natural growth heights diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a73865739..098bd3fba 100644 +index a738657394..098bd3fba8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -64,4 +64,13 @@ public class PaperWorldConfig { @@ -23,7 +23,7 @@ index a73865739..098bd3fba 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockCactus.java b/src/main/java/net/minecraft/server/BlockCactus.java -index 1e1d02dc7..e0974e256 100644 +index 1e1d02dc73..e0974e256f 100644 --- a/src/main/java/net/minecraft/server/BlockCactus.java +++ b/src/main/java/net/minecraft/server/BlockCactus.java @@ -30,7 +30,7 @@ public class BlockCactus extends Block { @@ -36,7 +36,7 @@ index 1e1d02dc7..e0974e256 100644 if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.cactusModifier) * 15) + 0.5F, 15)) { // Spigot diff --git a/src/main/java/net/minecraft/server/BlockReed.java b/src/main/java/net/minecraft/server/BlockReed.java -index 2106b0b49..55b07444e 100644 +index 2106b0b49f..55b07444e1 100644 --- a/src/main/java/net/minecraft/server/BlockReed.java +++ b/src/main/java/net/minecraft/server/BlockReed.java @@ -29,7 +29,7 @@ public class BlockReed extends Block { @@ -49,5 +49,5 @@ index 2106b0b49..55b07444e 100644 if (j >= (byte) range(3, ((100.0F / worldserver.spigotConfig.caneModifier) * 15) + 0.5F, 15)) { // Spigot -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch index ab54b8d75..af33b67a8 100644 --- a/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch +++ b/Spigot-Server-Patches/0011-Configurable-baby-zombie-movement-speed.patch @@ -1,11 +1,11 @@ -From b2087fc3339513038a7930819666f0fdc0e658e1 Mon Sep 17 00:00:00 2001 +From c71eb474e0735aac8eea843c10613e160978410b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:09:16 -0600 Subject: [PATCH] Configurable baby zombie movement speed diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 098bd3fba..912611cf1 100644 +index 098bd3fba8..912611cf1a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -73,4 +73,15 @@ public class PaperWorldConfig { @@ -25,7 +25,7 @@ index 098bd3fba..912611cf1 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 7783b5791..0240cef74 100644 +index 7783b57912..0240cef74a 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -21,7 +21,7 @@ public class EntityZombie extends EntityMonster { @@ -50,5 +50,5 @@ index 7783b5791..0240cef74 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch index 638db391c..a8226488d 100644 --- a/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch +++ b/Spigot-Server-Patches/0012-Configurable-fishing-time-ranges.patch @@ -1,11 +1,11 @@ -From 240b7f7dd0fb5db55639bfb8d89afc8c0b5be479 Mon Sep 17 00:00:00 2001 +From e56625227f320006b3dcfb16fd44c2a771df9410 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:14:11 -0600 Subject: [PATCH] Configurable fishing time ranges diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 912611cf1..7d9976ce6 100644 +index 912611cf1a..7d9976ce6b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -84,4 +84,12 @@ public class PaperWorldConfig { @@ -22,7 +22,7 @@ index 912611cf1..7d9976ce6 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index c899a99eb..b10de807e 100644 +index 7be189f742..40bdcf4e75 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -326,8 +326,9 @@ public class EntityFishingHook extends Entity { @@ -37,5 +37,5 @@ index c899a99eb..b10de807e 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch index 3b76b6040..fcedbcdc8 100644 --- a/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch +++ b/Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump-and-take-water-damage.patch @@ -1,4 +1,4 @@ -From e34c8a30bba3a35462e19d7de161c7fef123484f Mon Sep 17 00:00:00 2001 +From 42a58e4d6628de5ed09c9226c0a2cdbaf4a05fa3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 13:24:16 -0600 Subject: [PATCH] Allow nerfed mobs to jump and take water damage @@ -31,7 +31,7 @@ index 2e869004c8..8a6856e0fd 100644 this.b.setJumping(this.a); this.a = false; diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 74a4bf9c5c..b109f5ae2c 100644 +index e9d0a4eb90..957330b673 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1103,6 +1103,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -112,5 +112,5 @@ index 0f0dc7277f..43908b0400 100644 public void e() { if (this.a.getRandom().nextFloat() < 0.8F) { -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch index 4a03620e2..3a8b0638e 100644 --- a/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch +++ b/Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch @@ -1,4 +1,4 @@ -From 150dd44b4bb4169b9568dfc931b7a77f40469e65 Mon Sep 17 00:00:00 2001 +From d3e96c985d55b45be92fac75363155ca1c981bb9 Mon Sep 17 00:00:00 2001 From: Suddenly Date: Tue, 1 Mar 2016 13:51:54 -0600 Subject: [PATCH] Add configurable despawn distances for living entities @@ -48,5 +48,5 @@ index 70cd0801dc..23995b68a1 100644 } else if (d0 < 1024.0D) { this.ticksFarFromPlayer = 0; -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch index cccd0e827..b4c738eca 100644 --- a/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch +++ b/Spigot-Server-Patches/0015-Allow-for-toggling-of-spawn-chunks.patch @@ -1,11 +1,11 @@ -From 4ccd62f295eda1fe1536551f4630024575784324 Mon Sep 17 00:00:00 2001 +From a2a83ec2afba1860b85959162f1b3c0b5af44ad7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 3 Mar 2016 03:53:43 -0600 Subject: [PATCH] Allow for toggling of spawn chunks diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 284568641..8ee2b9bb1 100644 +index 2845686411..8ee2b9bb1b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -113,4 +113,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 284568641..8ee2b9bb1 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 132c08dd1..7d668759f 100644 +index 132c08dd19..7d668759fc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -141,6 +141,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -32,5 +32,5 @@ index 132c08dd1..7d668759f 100644 this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime); } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch index 2cc674a80..a2398d76b 100644 --- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch +++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch @@ -1,4 +1,4 @@ -From 0b5aede220e3c3085be9adb8ea747714ea5bbbcd Mon Sep 17 00:00:00 2001 +From 13986de1aeb1d12639e33b794b04416043f82784 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 14:14:15 -0600 Subject: [PATCH] Drop falling block and tnt entities at the specified height diff --git a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 3dd9eeef9..d00b6b838 100644 --- a/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -1,4 +1,4 @@ -From 31a95905403a03eea1e42a4da5d24d32223e997a Mon Sep 17 00:00:00 2001 +From 7d34230f0cb2c4243f6edb286cd1011d6636001f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -6,7 +6,7 @@ Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java -index 3f35a28ba..cf00f35a5 100644 +index 3f35a28ba1..cf00f35a5b 100644 --- a/src/main/java/net/minecraft/server/EULA.java +++ b/src/main/java/net/minecraft/server/EULA.java @@ -70,7 +70,7 @@ public class EULA { @@ -19,7 +19,7 @@ index 3f35a28ba..cf00f35a5 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4dc691775..2b3844ae5 100644 +index 4dc6917759..2b3844ae5a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1340,7 +1340,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 27 May 2019 03:40:05 -0500 Subject: [PATCH] Implement Paper VersionChecker @@ -6,7 +6,7 @@ Subject: [PATCH] Implement Paper VersionChecker diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java new file mode 100644 -index 000000000..5deed3e25 +index 0000000000..5deed3e25f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -0,0 +1,115 @@ @@ -126,7 +126,7 @@ index 000000000..5deed3e25 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 02f330053..b1e1b59d4 100644 +index 02f3300533..b1e1b59d45 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -303,6 +303,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -142,5 +142,5 @@ index 02f330053..b1e1b59d4 100644 /** -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch index b8efb47e3..252c0ff0e 100644 --- a/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch +++ b/Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch @@ -1,4 +1,4 @@ -From cf0ac8ca566b804db7eda4798fc0582bad42f01d Mon Sep 17 00:00:00 2001 +From 477ed65e869034181a365e5182ab2a1286f9bf70 Mon Sep 17 00:00:00 2001 From: Kyle Wood Date: Thu, 1 Mar 2018 19:37:52 -0600 Subject: [PATCH] Add version history to version command @@ -204,5 +204,5 @@ index d6646d7e61..4b1f8c5373 100644 this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch index 83aece486..65f6899d5 100644 --- a/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0020-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From a34a1fa15b9f78bb2654fd38a1b22b434468e1a6 Mon Sep 17 00:00:00 2001 +From d3732c933f94b0e8ce9b4e46a381652c73e38ef9 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Tue, 1 Mar 2016 14:47:52 -0600 Subject: [PATCH] Player affects spawning API @@ -69,5 +69,5 @@ index 35dbed40df..f7a4fdb833 100644 @Override public void updateCommands() { -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch index 99ddbb99b..000273373 100644 --- a/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch +++ b/Spigot-Server-Patches/0021-Remove-invalid-mob-spawner-tile-entities.patch @@ -1,11 +1,11 @@ -From caecbd9db7f124511fcbeb92cc6afb88982a412a Mon Sep 17 00:00:00 2001 +From a83cc296f887106ac4f9f510f9fd616b7ed2bac9 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 15:08:03 -0600 Subject: [PATCH] Remove invalid mob spawner tile entities diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 0b32179b7..9adb21279 100644 +index 0b32179b79..9adb212790 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -508,6 +508,10 @@ public class Chunk implements IChunkAccess { @@ -20,5 +20,5 @@ index 0b32179b7..9adb21279 100644 System.out.println("Attempted to place a tile entity (" + tileentity + ") at " + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ() + " (" + getType(blockposition) + ") where there was no entity tile!"); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch index 8f73495dc..43f6d85bc 100644 --- a/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch +++ b/Spigot-Server-Patches/0022-Optimize-TileEntity-Ticking.patch @@ -1,11 +1,11 @@ -From 35a616343d39f558da5ef9e28b9321df2dc689fe Mon Sep 17 00:00:00 2001 +From cb3baf5923937f6c9837ccbdb75bf1127b1b9c17 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 8 Mar 2015 22:55:25 -0600 Subject: [PATCH] Optimize TileEntity Ticking diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index 35f4dc75f..c4766f729 100644 +index 35f4dc75fb..c4766f729f 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity; @@ -91,7 +91,7 @@ index 35f4dc75f..c4766f729 100644 int newPower = Math.max(0, Math.min(15, this.viewingCount)); diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java -index 68737be5e..17c39edca 100644 +index 68737be5e6..17c39edca0 100644 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java @@ -1,6 +1,6 @@ @@ -182,5 +182,5 @@ index 68737be5e..17c39edca 100644 public boolean a(EntityHuman entityhuman) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch index 505b33410..c1568ee6c 100644 --- a/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch +++ b/Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch @@ -1,4 +1,4 @@ -From 681bdfdef2c555527c463424e57dc22a563177d1 Mon Sep 17 00:00:00 2001 +From 66cb7186fb398829970cb0df184ef6a1050c969c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2b3844ae5..7b8c523e6 100644 +index 2b3844ae5a..7b8c523e6d 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -160,7 +160,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString() + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 ); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch index 7cec4d413..bc821287a 100644 --- a/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch +++ b/Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch @@ -1,11 +1,11 @@ -From 5b50bfeefeb9e701e1f5e75c9ca849b82b0b6c52 Mon Sep 17 00:00:00 2001 +From 36ea04521668f513c7bcaa9d46778668560ecfa4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:12:03 -0600 Subject: [PATCH] Only refresh abilities if needed diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index f7a4fdb83..918045408 100644 +index f7a4fdb833..918045408b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1350,12 +1350,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -24,5 +24,5 @@ index f7a4fdb83..918045408 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0025-Entity-Origin-API.patch b/Spigot-Server-Patches/0025-Entity-Origin-API.patch index 134283f3e..64e19e3ae 100644 --- a/Spigot-Server-Patches/0025-Entity-Origin-API.patch +++ b/Spigot-Server-Patches/0025-Entity-Origin-API.patch @@ -1,4 +1,4 @@ -From 3e658fa51f422bcca75d0aef058fc6c3e96899a3 Mon Sep 17 00:00:00 2001 +From 76803ccabebffd4bd2ddc3856fe8cc053166165e Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] Entity Origin API diff --git a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch index 06b5a8449..79bc3ab71 100644 --- a/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch +++ b/Spigot-Server-Patches/0026-Prevent-tile-entity-and-entity-crashes.patch @@ -1,11 +1,11 @@ -From be08284655bd9a8090127ef2f899eb75b8e770da Mon Sep 17 00:00:00 2001 +From 2c9c77a6095c2b24e00ffb34689c49f92551b736 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 Mar 2016 23:52:34 -0600 Subject: [PATCH] Prevent tile entity and entity crashes diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index fa6400dcc..e2f3cec74 100644 +index fa6400dccd..e2f3cec742 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -194,7 +194,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -23,7 +23,7 @@ index fa6400dcc..e2f3cec74 100644 } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7d668759f..84d777022 100644 +index 7d668759fc..84d7770223 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -662,11 +662,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -64,5 +64,5 @@ index 7d668759f..84d777022 100644 } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch index 58dc10ca9..41fd3ddc0 100644 --- a/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch +++ b/Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch @@ -1,4 +1,4 @@ -From 8bf306906c2242f0e0e2409fb29411a2a1cb4c4f Mon Sep 17 00:00:00 2001 +From 1ee3c8ba2a898176de4110c023ed06b02dbffe1e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage @@ -29,7 +29,7 @@ index d59b82b7bb..f7a0a33e49 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 1b2edca722..251087ec20 100644 +index 18236504e4..826202f437 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -406,9 +406,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -96,5 +96,5 @@ index e4d1f37f9f..c2843d5d60 100644 // this.doPortalTick(); // CraftBukkit - handled in postTick if (this.world.isClientSide) { -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch index 722bc1c50..5b1cc3b06 100644 --- a/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch +++ b/Spigot-Server-Patches/0028-Check-online-mode-before-converting-and-renaming-pla.patch @@ -1,11 +1,11 @@ -From 6d8ac7f73c806da3041acc6f0af36b81acf64b2e Mon Sep 17 00:00:00 2001 +From 1afa27377464445772cddb3095fa446755b7a5d4 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:03:55 -0600 Subject: [PATCH] Check online mode before converting and renaming player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index 97bac7d25..a0254d8e5 100644 +index 97bac7d257..a0254d8e51 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -164,7 +164,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -18,5 +18,5 @@ index 97bac7d25..a0254d8e5 100644 file = new File( this.playerDir, UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + entityhuman.getName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); if ( file.exists() ) -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch index 238f696ce..20599c6bf 100644 --- a/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch +++ b/Spigot-Server-Patches/0029-Always-tick-falling-blocks.patch @@ -1,11 +1,11 @@ -From 180acebaa18e225da5408a5fcaee99729b8bd110 Mon Sep 17 00:00:00 2001 +From b51a9f6a415c93d11b5bc7110b38250708a5e372 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 00:32:25 -0600 Subject: [PATCH] Always tick falling blocks diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 442383969..f86404f83 100644 +index 4423839697..f86404f83a 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -13,6 +13,7 @@ import net.minecraft.server.EntityCreature; @@ -25,5 +25,5 @@ index 442383969..f86404f83 100644 || entity instanceof EntityFireworks || entity instanceof EntityThrownTrident ) -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0030-Configurable-end-credits.patch b/Spigot-Server-Patches/0030-Configurable-end-credits.patch index 144b69ca1..c586adc11 100644 --- a/Spigot-Server-Patches/0030-Configurable-end-credits.patch +++ b/Spigot-Server-Patches/0030-Configurable-end-credits.patch @@ -1,4 +1,4 @@ -From c084ec91efac4a1c1d5721f399bd0647a1151d9c Mon Sep 17 00:00:00 2001 +From 93a13539a9014db15fc843302d3105691962514a Mon Sep 17 00:00:00 2001 From: DoctorDark Date: Wed, 16 Mar 2016 02:21:39 -0500 Subject: [PATCH] Configurable end credits @@ -41,5 +41,5 @@ index 57ce9bde64..23c1706874 100644 this.cm = true; } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch index 9e768753a..d2760e526 100644 --- a/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch +++ b/Spigot-Server-Patches/0031-Fix-lag-from-explosions-processing-dead-entities.patch @@ -1,11 +1,11 @@ -From ba7b394464d30072299b40f04cfb9bbfe859f848 Mon Sep 17 00:00:00 2001 +From d778699c1d27e184b08b5ea229b044414bfc84cb Mon Sep 17 00:00:00 2001 From: Iceee Date: Wed, 2 Mar 2016 01:39:52 -0600 Subject: [PATCH] Fix lag from explosions processing dead entities diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 4b1bba1c9..d2c31ac1f 100644 +index eb7b8d94c8..a063d1bfaa 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -151,7 +151,14 @@ public class Explosion { @@ -25,7 +25,7 @@ index 4b1bba1c9..d2c31ac1f 100644 for (int l1 = 0; l1 < list.size(); ++l1) { diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index c75ed9ddc..c1f462d9d 100644 +index c75ed9ddc1..c1f462d9d3 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -14,6 +14,7 @@ public final class IEntitySelector { @@ -37,5 +37,5 @@ index c75ed9ddc..c1f462d9d 100644 return !(entity instanceof EntityHuman) || !entity.isSpectator() && !((EntityHuman) entity).isCreative(); }; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0032-Optimize-explosions.patch b/Spigot-Server-Patches/0032-Optimize-explosions.patch index 0760d390b..dd66417f1 100644 --- a/Spigot-Server-Patches/0032-Optimize-explosions.patch +++ b/Spigot-Server-Patches/0032-Optimize-explosions.patch @@ -1,4 +1,4 @@ -From 8e215ed62552a6272e098b2e13450e36c6025b23 Mon Sep 17 00:00:00 2001 +From fa60dfa8abbded975fd2e8345c362951447801b9 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -10,7 +10,7 @@ This patch adds a per-tick cache that is used for storing and retrieving an entity's exposure during an explosion. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 50dec5cb5..f038d3f7d 100644 +index 50dec5cb5e..f038d3f7dc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -150,4 +150,10 @@ public class PaperWorldConfig { @@ -25,7 +25,7 @@ index 50dec5cb5..f038d3f7d 100644 + } } diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index a063d1bfa..5583860f1 100644 +index a063d1bfaa..5583860f15 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -177,7 +177,7 @@ public class Explosion { @@ -123,7 +123,7 @@ index a063d1bfa..5583860f1 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7b8c523e6..3d580a666 100644 +index 7b8c523e6d..3d580a666b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1176,6 +1176,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 2 Mar 2016 14:48:03 -0600 Subject: [PATCH] Disable explosion knockback diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f038d3f7d..25e071718 100644 +index f038d3f7dc..25e0717186 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -156,4 +156,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index f038d3f7d..25e071718 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 35e3f1c78..9bd673700 100644 +index 35e3f1c78d..9bd6737007 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1073,6 +1073,7 @@ public abstract class EntityLiving extends Entity { @@ -48,7 +48,7 @@ index 35e3f1c78..9bd673700 100644 if (!this.f(damagesource)) { SoundEffect soundeffect = this.getSoundDeath(); diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index 64cf5a29c..8762a566d 100644 +index 5583860f15..d99d2defe9 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -193,14 +193,14 @@ public class Explosion { @@ -69,5 +69,5 @@ index 64cf5a29c..8762a566d 100644 } } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0034-Disable-thunder.patch b/Spigot-Server-Patches/0034-Disable-thunder.patch index 1107b796a..562239153 100644 --- a/Spigot-Server-Patches/0034-Disable-thunder.patch +++ b/Spigot-Server-Patches/0034-Disable-thunder.patch @@ -1,4 +1,4 @@ -From d04b0dfb3bb79611afbde1887e6d87b9a66f9327 Mon Sep 17 00:00:00 2001 +From 203e24c56357c7f87791b8e01ecc59b44e545fe4 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:52:43 -0600 Subject: [PATCH] Disable thunder @@ -19,7 +19,7 @@ index 25e0717186..41436a4ead 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 5e760818fb..3ba54917af 100644 +index 450b414298..856857d559 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -445,7 +445,7 @@ public class WorldServer extends World { @@ -32,5 +32,5 @@ index 5e760818fb..3ba54917af 100644 if (this.isRainingAt(blockposition)) { DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition); -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch index ce4b223c4..06b5de608 100644 --- a/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch +++ b/Spigot-Server-Patches/0035-Disable-ice-and-snow.patch @@ -1,4 +1,4 @@ -From 57e7eb12376863a7faa4fba8cce5b5fec37f0767 Mon Sep 17 00:00:00 2001 +From 7fb1549030943565fa14dd15b2aaed60d6732d22 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 14:57:24 -0600 Subject: [PATCH] Disable ice and snow @@ -19,7 +19,7 @@ index 41436a4ead..f53d8b9675 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 3ba54917af..4309a7d07a 100644 +index 856857d559..a34df8ce5d 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -465,7 +465,7 @@ public class WorldServer extends World { @@ -32,5 +32,5 @@ index 3ba54917af..4309a7d07a 100644 BlockPosition blockposition1 = blockposition.down(); BiomeBase biomebase = this.getBiome(blockposition); -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch index 1a9b5d755..1438cac75 100644 --- a/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch +++ b/Spigot-Server-Patches/0036-Configurable-mob-spawner-tick-rate.patch @@ -1,11 +1,11 @@ -From 11d856c9142722c092742373c440eb2dd8f6ecf2 Mon Sep 17 00:00:00 2001 +From 8371a46288465ed7fe510f33afec01dbaab93282 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 15:03:53 -0600 Subject: [PATCH] Configurable mob spawner tick rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f53d8b967..428deed56 100644 +index f53d8b9675..428deed56d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -171,4 +171,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index f53d8b967..428deed56 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 813de2a6d..deb32db2b 100644 +index 0f23313e89..b249af20c4 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -24,6 +24,7 @@ public abstract class MobSpawnerAbstract { @@ -64,5 +64,5 @@ index 813de2a6d..deb32db2b 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch index d47f45b97..78e582bae 100644 --- a/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch +++ b/Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch @@ -1,4 +1,4 @@ -From ceaede64459309b8a6cf12881d861e8ee5a90dff Mon Sep 17 00:00:00 2001 +From 37de5b98196c7a889e95c9d1b89966b3ae3e7c09 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Wed, 2 Mar 2016 23:13:07 -0600 Subject: [PATCH] Send absolute position the first time an entity is seen @@ -77,7 +77,7 @@ index a75e0ec54e..a13fd9b340 100644 this.c(); diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 1f289047fa..b2260498cb 100644 +index 2a6955f855..3dd72e0842 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -1217,10 +1217,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -107,5 +107,5 @@ index 1f289047fa..b2260498cb 100644 } } else if (this.trackedPlayers.remove(entityplayer)) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch index cbfa77d98..117cb2bb4 100644 --- a/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch +++ b/Spigot-Server-Patches/0038-Add-BeaconEffectEvent.patch @@ -1,11 +1,11 @@ -From f3f2ed87c739c1d162682a01e484e8460f62bc8e Mon Sep 17 00:00:00 2001 +From 5ac25a0ea16c5596da57d29a473fad1488b70b6b Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 23:30:53 -0600 Subject: [PATCH] Add BeaconEffectEvent diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java -index 9614bec20..f62cf7219 100644 +index 536afe5312..df2d6c3b07 100644 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java @@ -14,6 +14,11 @@ import org.bukkit.craftbukkit.potion.CraftPotionUtil; @@ -67,5 +67,5 @@ index 9614bec20..f62cf7219 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch index 49f10f816..4c886ed1d 100644 --- a/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch +++ b/Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch @@ -1,4 +1,4 @@ -From de587b9b8c013c069adefd8afd0dbbae0bb9f640 Mon Sep 17 00:00:00 2001 +From 83f9c922ea4a2223820573e8319324864516964c Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Wed, 2 Mar 2016 23:34:44 -0600 Subject: [PATCH] Configurable container update tick rate @@ -45,5 +45,5 @@ index 23c1706874..f0f456983f 100644 this.closeInventory(); this.activeContainer = this.defaultContainer; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch index a5777334b..c3a439d56 100644 --- a/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch +++ b/Spigot-Server-Patches/0040-Use-UserCache-for-player-heads.patch @@ -1,11 +1,11 @@ -From 032e1559199d44e5ed104c1df340049143915850 Mon Sep 17 00:00:00 2001 +From 9d71f9f229aae7b45e44f5b7144d0403e5617142 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 2 Mar 2016 23:42:37 -0600 Subject: [PATCH] Use UserCache for player heads diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index a6e95a909..4fb27cc7e 100644 +index a6e95a9097..4fb27cc7ed 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -157,7 +157,13 @@ class CraftMetaSkull extends CraftMetaItem implements SkullMeta { @@ -24,5 +24,5 @@ index a6e95a909..4fb27cc7e 100644 return true; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch index e9f8c01a9..ea0fcca5b 100644 --- a/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch +++ b/Spigot-Server-Patches/0041-Disable-spigot-tick-limiters.patch @@ -1,11 +1,11 @@ -From abd1fbac152de90626f42815e5ec7b0a42228d8b Mon Sep 17 00:00:00 2001 +From a9cda7abf87075eb1ccac611cd60fb52667de7f6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Mar 2016 23:45:17 -0600 Subject: [PATCH] Disable spigot tick limiters diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 7c95fd664..389fadf92 100644 +index 7c95fd6645..389fadf927 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -632,9 +632,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -20,5 +20,5 @@ index 7c95fd664..389fadf92 100644 TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition); // Spigot start -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch index 95a0c40fd..277a533a8 100644 --- a/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch +++ b/Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch @@ -1,4 +1,4 @@ -From 323db20b3fd4afef99c64e7ed9ec50af17638871 Mon Sep 17 00:00:00 2001 +From 4b592b7a0a297805978f5eae8345b855a79d5faa Mon Sep 17 00:00:00 2001 From: Steve Anton Date: Thu, 3 Mar 2016 00:09:38 -0600 Subject: [PATCH] Add PlayerInitialSpawnEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent For modifying a player's initial spawn location as they join the server diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 1652a57e2..948a6e3b7 100644 +index 1652a57e25..948a6e3b7a 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -109,7 +109,20 @@ public abstract class PlayerList { @@ -32,5 +32,5 @@ index 1652a57e2..948a6e3b7 100644 String s1 = "local"; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch index 3eb63ea7a..eaa5b71ee 100644 --- a/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch +++ b/Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch @@ -1,4 +1,4 @@ -From 9397491dad4f775c038000ad80dba9fa5704eb2a Mon Sep 17 00:00:00 2001 +From 30a10e2157319ce6016dc206eb05da580e7f6a88 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:13:45 -0600 Subject: [PATCH] Configurable Disabling Cat Chest Detection @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Disabling Cat Chest Detection Offers a gameplay feature to stop cats from blocking chests diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a4da22ea6..345ac63e2 100644 +index a4da22ea65..345ac63e28 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -181,4 +181,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index a4da22ea6..345ac63e2 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java -index 033cb78d9..72fb92f7c 100644 +index 033cb78d91..72fb92f7c3 100644 --- a/src/main/java/net/minecraft/server/BlockChest.java +++ b/src/main/java/net/minecraft/server/BlockChest.java @@ -267,6 +267,11 @@ public class BlockChest extends BlockChestAbstract implements I @@ -36,5 +36,5 @@ index 033cb78d9..72fb92f7c 100644 if (!list.isEmpty()) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch index a7c6934e7..8dd094308 100644 --- a/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch +++ b/Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch @@ -1,4 +1,4 @@ -From 8611dc3d7c2d3cdc9187a2121c5805bc22b123e0 Mon Sep 17 00:00:00 2001 +From f257bfd57e675b1d5c23dc98d9f0e7afb4cf0745 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 01:17:12 -0600 Subject: [PATCH] Ensure commands are not ran async @@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren that it is happening so that plugin authors can fix their code to stop executing commands async. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 914366afc..5e8739462 100644 +index 914366afcd..5e8739462e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1570,6 +1570,29 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -48,7 +48,7 @@ index 914366afc..5e8739462 100644 } else if (this.player.getChatFlags() == EnumChatVisibility.SYSTEM) { // Do nothing, this is coming from a plugin diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index e3939387e..f7c29e372 100644 +index e3939387e7..f7c29e372f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -720,6 +720,29 @@ public final class CraftServer implements Server { @@ -82,7 +82,7 @@ index e3939387e..f7c29e372 100644 return true; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index ddef523ea..70f8d4299 100644 +index ddef523ea8..70f8d42992 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -13,6 +13,7 @@ public class ServerShutdownThread extends Thread { @@ -94,7 +94,7 @@ index ddef523ea..70f8d4299 100644 } finally { try { diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index aeed76972..9f7d2ef93 100644 +index aeed769725..9f7d2ef932 100644 --- a/src/main/java/org/spigotmc/AsyncCatcher.java +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -6,6 +6,7 @@ public class AsyncCatcher @@ -106,7 +106,7 @@ index aeed76972..9f7d2ef93 100644 public static void catchOp(String reason) { diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java -index e7b953ca3..ccea803f5 100644 +index e7b953ca31..ccea803f58 100644 --- a/src/main/java/org/spigotmc/RestartCommand.java +++ b/src/main/java/org/spigotmc/RestartCommand.java @@ -43,6 +43,7 @@ public class RestartCommand extends Command @@ -118,5 +118,5 @@ index e7b953ca3..ccea803f5 100644 { String[] split = restartScript.split( " " ); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch index fbef11ee3..15bfdd265 100644 --- a/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch +++ b/Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch @@ -1,11 +1,11 @@ -From 7c53690eb26599b91ca4ea2ad52a7b41640e19b8 Mon Sep 17 00:00:00 2001 +From 840e5a36c96131f69f3a9867734e8f5019e3c86a Mon Sep 17 00:00:00 2001 From: vemacs Date: Thu, 3 Mar 2016 01:19:22 -0600 Subject: [PATCH] All chunks are slime spawn chunks toggle diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 345ac63e2..62e793b71 100644 +index 345ac63e28..62e793b71b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -186,4 +186,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 345ac63e2..62e793b71 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 8e8526f37..3ecf73219 100644 +index 8e8526f371..3ecf732192 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -289,7 +289,7 @@ public class EntitySlime extends EntityInsentient implements IMonster { @@ -32,5 +32,5 @@ index 8e8526f37..3ecf73219 100644 if (random.nextInt(10) == 0 && flag && blockposition.getY() < 40) { return a(entitytypes, generatoraccess, enummobspawn, blockposition, random); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch index cfc4842f0..b4fb91827 100644 --- a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch +++ b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch @@ -1,11 +1,11 @@ -From 06c67e735b044dcf1d59d1352f235be1201f51df Mon Sep 17 00:00:00 2001 +From 99cba28e61e41a780f83190acf26fa1ce24f02bf Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:15:57 -0600 Subject: [PATCH] Expose server CommandMap diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f7c29e372..6107070b3 100644 +index f7c29e372f..6107070b33 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1629,6 +1629,7 @@ public final class CraftServer implements Server { @@ -17,5 +17,5 @@ index f7c29e372..6107070b3 100644 return commandMap; } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch index 4da0b1bca..6696a9004 100644 --- a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch +++ b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch @@ -1,4 +1,4 @@ -From 52d08106aaf038ff55713546beaec0f2a249710a Mon Sep 17 00:00:00 2001 +From 285f963c7672a8825e5b1c6d56bc431503527da7 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 3 Mar 2016 02:18:39 -0600 Subject: [PATCH] Be a bit more informative in maxHealth exception @@ -21,5 +21,5 @@ index 4f20003193..54c0dae5d1 100644 getHandle().setHealth((float) health); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch index cd813c844..75fcabdb7 100644 --- a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch @@ -1,11 +1,11 @@ -From 6c3be7ba6d6fbcd4e5eb7895ce4e133b7cc53157 Mon Sep 17 00:00:00 2001 +From ddf72ce7e9f490020d123587c5633f3d362ec3c3 Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 02:32:10 -0600 Subject: [PATCH] Player Tab List and Title APIs diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java -index cf89622a8..fb97c51bb 100644 +index cf89622a8b..fb97c51bb1 100644 --- a/src/main/java/net/minecraft/server/IChatBaseComponent.java +++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java @@ -439,6 +439,7 @@ public interface IChatBaseComponent extends Message, Iterable { @@ -52,7 +52,7 @@ index 3a6e78000..535056c64 100644 if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 918045408..bbf5a652f 100644 +index 918045408b..bbf5a652f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1,5 +1,6 @@ @@ -160,5 +160,5 @@ index 918045408..bbf5a652f 100644 public String getDisplayName() { return getHandle().displayName; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch index 73334e1c8..050288111 100644 --- a/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch +++ b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch @@ -1,11 +1,11 @@ -From d9325e0572213e7239ba0425215947c143a2d00f Mon Sep 17 00:00:00 2001 +From a84fc1a0898f892699af702afd47839470a55eec Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:33:53 -0600 Subject: [PATCH] Ensure inv drag is in bounds diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java -index e38438db6..0c3a2f080 100644 +index e38438db6e..0c3a2f080c 100644 --- a/src/main/java/net/minecraft/server/Container.java +++ b/src/main/java/net/minecraft/server/Container.java @@ -201,7 +201,7 @@ public abstract class Container { @@ -18,5 +18,5 @@ index e38438db6..0c3a2f080 100644 itemstack1 = playerinventory.getCarried(); if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.i.size()) && this.b(slot)) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch index 501f9ceaa..e49c3ec11 100644 --- a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch +++ b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch @@ -1,4 +1,4 @@ -From 1e5c06435b406b7856ec9527fb7ebb607293a3e2 Mon Sep 17 00:00:00 2001 +From 3b07ec668b502206dbe64a7eb7207da8c515d0fb Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:39:54 -0600 Subject: [PATCH] Change implementation of (tile)entity removal list @@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list use sets for faster removal diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ef00928466..caead09a64 100644 +index 389fadf927..74be3e40d1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -36,7 +36,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -19,5 +19,5 @@ index ef00928466..caead09a64 100644 private int c; protected int i = (new Random()).nextInt(); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch index 3f994dbb3..de295c656 100644 --- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch +++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch @@ -1,4 +1,4 @@ -From b113387904be5b1c2908e34c86851c78f00d5caa Mon Sep 17 00:00:00 2001 +From 547ba9b126ab6998513ee8909dc9c4c71f97bfb7 Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:46:17 -0600 Subject: [PATCH] Add configurable portal search radius diff --git a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch index 087ad09e9..b0b5f3cc4 100644 --- a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch +++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch @@ -1,11 +1,11 @@ -From 0b36e22794f7672b7b3b4a4f14132ee0afaa3d4e Mon Sep 17 00:00:00 2001 +From e13cf3ad01cfb1f84b86fe970e8b4094a013da7e Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 02:48:12 -0600 Subject: [PATCH] Add velocity warnings diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 37d3e2c80..096053c0a 100644 +index 6107070b33..0cbf11aabb 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -234,6 +234,7 @@ public final class CraftServer implements Server { @@ -17,7 +17,7 @@ index 37d3e2c80..096053c0a 100644 static { ConfigurationSerialization.registerClass(CraftOfflinePlayer.class); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index a29693674..bb07dec3c 100644 +index a296936748..bb07dec3c8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -407,10 +407,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -63,7 +63,7 @@ index a29693674..bb07dec3c 100644 public double getHeight() { return getHandle().getHeight(); diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index 73fa74e3c..d96100061 100644 +index 73fa74e3cc..d961000611 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -76,7 +76,19 @@ public class WatchdogThread extends Thread @@ -88,5 +88,5 @@ index 73fa74e3c..d96100061 100644 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log ); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch index f7957a36d..6a1c5cbed 100644 --- a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch +++ b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch @@ -1,4 +1,4 @@ -From 2a3c98072df76452c7a5d9f6ca485bd0a977c900 Mon Sep 17 00:00:00 2001 +From c96869b67ee7a03c144c421cc39e83d5d83a1249 Mon Sep 17 00:00:00 2001 From: Sudzzy Date: Thu, 3 Mar 2016 02:50:31 -0600 Subject: [PATCH] Configurable inter-world teleportation safety @@ -16,7 +16,7 @@ The wanted destination was on top of the emerald block however the player ended This only is the case if the player is teleporting between worlds. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cd47a4ca0..abbf59bb9 100644 +index cd47a4ca06..abbf59bb91 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -198,4 +198,9 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index cd47a4ca0..abbf59bb9 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index bbf5a652f..658854dc9 100644 +index bbf5a652f3..658854dc93 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -760,7 +760,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -43,5 +43,5 @@ index bbf5a652f..658854dc9 100644 return true; } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch index 52ba3fa46..9113711c2 100644 --- a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch +++ b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch @@ -1,4 +1,4 @@ -From 9c2e2bd4f00ba7db7f39ce492e6d875e89ca2480 Mon Sep 17 00:00:00 2001 +From edd30270fe295be3faac2fe37d6c08d4ddd94c0f Mon Sep 17 00:00:00 2001 From: Joseph Hirschfeld Date: Thu, 3 Mar 2016 03:15:41 -0600 Subject: [PATCH] Add exception reporting event @@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event diff --git a/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java new file mode 100644 -index 000000000..f699ce18c +index 0000000000..f699ce18ca --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ServerSchedulerReportingWrapper.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 000000000..f699ce18c + } +} diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 9adb21279..f3d20f214 100644 +index 9adb212790..f3d20f214d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -1,5 +1,6 @@ @@ -80,7 +80,7 @@ index 9adb21279..f3d20f214 100644 } } diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index a3d150a13..c83e0cd4e 100644 +index a878f7c759..e5d89299f6 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -15,6 +15,9 @@ import java.util.function.BooleanSupplier; @@ -94,7 +94,7 @@ index a3d150a13..c83e0cd4e 100644 public class ChunkProviderServer extends IChunkProvider { diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index c9c2b0025..1422503e1 100644 +index c9c2b00251..1422503e11 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -1,5 +1,6 @@ @@ -121,7 +121,7 @@ index c9c2b0025..1422503e1 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 3dd72e084..291c2a17b 100644 +index 3dd72e0842..291c2a17bb 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -727,6 +727,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -141,7 +141,7 @@ index 3dd72e084..291c2a17b 100644 } } diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index 187c4e0f5..c2312a227 100644 +index 187c4e0f58..c2312a227c 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -241,6 +241,7 @@ public class RegionFile implements AutoCloseable { @@ -161,7 +161,7 @@ index 187c4e0f5..c2312a227 100644 } finally { if (filechannel != null) { diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 8ba344df6..02157d051 100644 +index 8ba344df64..02157d051f 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -8,6 +8,7 @@ import org.apache.logging.log4j.LogManager; @@ -189,7 +189,7 @@ index 8ba344df6..02157d051 100644 } diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java -index d5e9bae70..1bcf01c09 100644 +index d5e9bae709..1bcf01c09a 100644 --- a/src/main/java/net/minecraft/server/VillageSiege.java +++ b/src/main/java/net/minecraft/server/VillageSiege.java @@ -1,5 +1,7 @@ @@ -209,7 +209,7 @@ index d5e9bae70..1bcf01c09 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 74be3e40d..6e68c013a 100644 +index 74be3e40d1..6e68c013a4 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2,6 +2,9 @@ package net.minecraft.server; @@ -248,7 +248,7 @@ index 74be3e40d..6e68c013a 100644 return; // Paper end diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java -index 19e68a783..a2a25cf6a 100644 +index 19e68a7831..a2a25cf6a4 100644 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java @@ -121,6 +121,7 @@ public class WorldPersistentData { @@ -260,7 +260,7 @@ index 19e68a783..a2a25cf6a 100644 } finally { if (pushbackinputstream != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 8823f94f7..552daf437 100644 +index 8823f94f7b..552daf4376 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -16,6 +16,9 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -306,5 +306,5 @@ index 8823f94f7..552daf437 100644 // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch index 729be50d0..dec9c245d 100644 --- a/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch +++ b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch @@ -1,4 +1,4 @@ -From 049488af16a1c77cb3c42e2767c59a25d0f39317 Mon Sep 17 00:00:00 2001 +From 5f426a49c955320fe62c430f7fa2239a13455d49 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 8 Mar 2016 18:28:43 -0800 Subject: [PATCH] Don't nest if we don't need to when cerealising text @@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index fa4eab5b0..0ab611564 100644 +index fa4eab5b0b..0ab611564e 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -29,7 +29,14 @@ public class PacketPlayOutChat implements Packet { @@ -26,5 +26,5 @@ index fa4eab5b0..0ab611564 100644 packetdataserializer.a(this.a); } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch index 4c7accda2..16fbfe9e8 100644 --- a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch +++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch @@ -1,4 +1,4 @@ -From 5a208c0c6591b2176760aede2ac3c3a22b0f1276 Mon Sep 17 00:00:00 2001 +From a3e6dafdcd480f3bc5898d5dd4e8058c88fd5ebb Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 8 Mar 2016 23:25:45 -0500 Subject: [PATCH] Disable Scoreboards for non players by default diff --git a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch index 9de124723..29a060d60 100644 --- a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch +++ b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch @@ -1,4 +1,4 @@ -From f218eddcc79740ff53c5845807eb0119052129e6 Mon Sep 17 00:00:00 2001 +From 6119d798c671daf0b5f9faa4bded2ec1c255a336 Mon Sep 17 00:00:00 2001 From: mrapple Date: Sun, 25 Nov 2012 13:43:39 -0600 Subject: [PATCH] Add methods for working with arrows stuck in living entities @@ -26,5 +26,5 @@ index 54c0dae5d1..e38f4f6910 100644 + // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch index caf8c600f..8abccdf2c 100644 --- a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch +++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch @@ -1,11 +1,11 @@ -From 7dae55fc2612508d4644257ecd7605bec633e679 Mon Sep 17 00:00:00 2001 +From ff2417af80fc45e18e0b8d628b5c69ec088425e1 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 23:17:52 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5e8739462..3c8c9c9cd 100644 +index 5e8739462e..3c8c9c9cd4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1335,7 +1335,11 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -22,7 +22,7 @@ index 5e8739462..3c8c9c9cd 100644 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 658854dc9..2cdea9f5d 100644 +index 658854dc93..2cdea9f5d0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -134,6 +134,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -70,5 +70,5 @@ index 658854dc9..2cdea9f5d 100644 @Override -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch index f44d1418d..44490be43 100644 --- a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch +++ b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch @@ -1,4 +1,4 @@ -From d4cb9bfcff7407bd54270893ed122aa74d4f4611 Mon Sep 17 00:00:00 2001 +From 1b8cce025dfa35eeca87658c030aa0ba39540b47 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Mar 2013 23:46:10 -0500 Subject: [PATCH] Chunk Save Reattempt @@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks. diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index c2312a227..cee1ea8f4 100644 +index c2312a227c..cee1ea8f43 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -241,7 +241,7 @@ public class RegionFile implements AutoCloseable { @@ -19,7 +19,7 @@ index c2312a227..cee1ea8f4 100644 } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index a7f19c849..2fe27b460 100644 +index a7f19c8498..2fe27b460d 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -80,6 +80,7 @@ public final class RegionFileCache implements AutoCloseable { @@ -50,5 +50,5 @@ index a7f19c849..2fe27b460 100644 public void close() throws IOException { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch index dffd48b47..fd323ba61 100644 --- a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch +++ b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch @@ -1,4 +1,4 @@ -From 29c0ae1b797b1e2e823dd04220e6c8e12aa89fd9 Mon Sep 17 00:00:00 2001 +From 990878456ceba6c4c1228cda75f1dcff3f20d08c Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:17:38 -0400 Subject: [PATCH] Default loading permissions.yml before plugins @@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe A config option has been added for those who depend on the previous behavior, but I don't expect that. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index f402a29b0..6ef5bb9f3 100644 +index f402a29b09..6ef5bb9f32 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -213,4 +213,9 @@ public class PaperConfig { @@ -30,7 +30,7 @@ index f402a29b0..6ef5bb9f3 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 096053c0a..9c9f7cee6 100644 +index 0cbf11aabb..30286a50d2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -370,6 +370,7 @@ public final class CraftServer implements Server { @@ -51,5 +51,5 @@ index 096053c0a..9c9f7cee6 100644 syncCommands(); } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch index 8eebaa114..a879ab9ca 100644 --- a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch +++ b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch @@ -1,4 +1,4 @@ -From 1053c2b77c943e8f935e414456ecfa157c5e9e7b Mon Sep 17 00:00:00 2001 +From 86da5e97c576d9d8425ab1d26626ea0b0312d58c Mon Sep 17 00:00:00 2001 From: William Date: Fri, 18 Mar 2016 03:30:17 -0400 Subject: [PATCH] Allow Reloading of Custom Permissions @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions https://github.com/PaperMC/Paper/issues/49 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 30286a50d..c65e6256b 100644 +index 30286a50d2..c65e6256b5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2089,5 +2089,23 @@ public final class CraftServer implements Server { @@ -34,5 +34,5 @@ index 30286a50d..c65e6256b 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch index 8bc24fcde..61c69112e 100644 --- a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch +++ b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch @@ -1,4 +1,4 @@ -From 2e850c1d5043b2035d22ef12a6d140b59c0fb0e0 Mon Sep 17 00:00:00 2001 +From 8ef555514105d3d78c839c54712a316598f46f47 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 13:50:14 -0400 Subject: [PATCH] Remove Metadata on reload @@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive This will remove metadata on reload so it does not crash everything if a plugin uses it. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c65e6256b..cf0733baf 100644 +index c65e6256b5..cf0733baf7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -825,8 +825,18 @@ public final class CraftServer implements Server { @@ -30,5 +30,5 @@ index c65e6256b..cf0733baf 100644 reloadData(); org.spigotmc.SpigotConfig.registerCommands(); // Spigot -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch index 8f4dc3086..73c5c37a9 100644 --- a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch +++ b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch @@ -1,4 +1,4 @@ -From f5ef9c2edc0495ffb71c6449542838dd2019d5cc Mon Sep 17 00:00:00 2001 +From 1e58ad0c55592a067a4cad8ceeb6f5564fe5cfc9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 14:19:19 -0400 Subject: [PATCH] Undead horse leashing @@ -6,7 +6,7 @@ Subject: [PATCH] Undead horse leashing default false to match vanilla, but option to allow undead horse types to be leashed. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 04430aae5..dd2122153 100644 +index 04430aae52..dd21221534 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -208,4 +208,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 04430aae5..dd2122153 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java -index b611ade24..c56efe035 100644 +index b611ade248..c56efe035a 100644 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java @@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven @@ -33,5 +33,5 @@ index b611ade24..c56efe035 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch index ab754bb40..d6b5c37f1 100644 --- a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch +++ b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch @@ -1,4 +1,4 @@ -From 4cb5bd54e916939bb5f250ecfa940b3de731278f Mon Sep 17 00:00:00 2001 +From 1da4ff23b69bd766323f53f3d9d65d5711fcbcc8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 May 2015 23:00:19 -0400 Subject: [PATCH] Handle Item Meta Inconsistencies @@ -330,5 +330,5 @@ index f46119ea4d..bd9e09f999 100644 + } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch index 1cd45ea2a..824364fc2 100644 --- a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch +++ b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch @@ -1,4 +1,4 @@ -From b85c2b8c568823781b70e9a16ba566eff507f4c0 Mon Sep 17 00:00:00 2001 +From 70269bcc8f0391a9b58de24b24a0732b3797fe4e Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 15:12:22 -0400 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate Can set a much shorter despawn rate for arrows that players can not pick up. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index dd2122153..7de7b74ff 100644 +index dd21221534..7de7b74ff6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -213,4 +213,19 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index dd2122153..7de7b74ff 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index a9f843aad..2b14b2c3f 100644 +index a9f843aade..2b14b2c3fa 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -266,7 +266,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -43,5 +43,5 @@ index a9f843aad..2b14b2c3f 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch index 6ff30a855..91368671c 100644 --- a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch +++ b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch @@ -1,4 +1,4 @@ -From 02692be9ad22aecba400483042971666046d8af9 Mon Sep 17 00:00:00 2001 +From 2546f4b4f0ffb8a812a947499a9a512fc110dfdf Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 20:16:03 -0400 Subject: [PATCH] Add World Util Methods @@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods Methods that can be used for other patches to help improve logic. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6e68c013a..c2039d0e4 100644 +index 6e68c013a4..c2039d0e46 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -222,6 +222,18 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -29,7 +29,7 @@ index 6e68c013a..c2039d0e4 100644 @Override diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 020e5c171..4ee13ac45 100644 +index 020e5c171a..4ee13ac454 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -19,6 +19,7 @@ public class WorldBorder { @@ -41,5 +41,5 @@ index 020e5c171..4ee13ac45 100644 return (double) (blockposition.getX() + 1) > this.c() && (double) blockposition.getX() < this.e() && (double) (blockposition.getZ() + 1) > this.d() && (double) blockposition.getZ() < this.f(); } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch index b9a2884f3..abbb6f459 100644 --- a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch +++ b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch @@ -1,11 +1,11 @@ -From 54f471c9138e0ee510be393934e6c9bfb7ed78da Mon Sep 17 00:00:00 2001 +From 00cb921766677cf40dca4350328219dbca421b0c Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 21 Jun 2015 15:07:20 -0400 Subject: [PATCH] Custom replacement for eaten items diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index cd9c49747..1eca778d3 100644 +index cd9c49747d..1eca778d31 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2896,9 +2896,10 @@ public abstract class EntityLiving extends Entity { @@ -42,5 +42,5 @@ index cd9c49747..1eca778d3 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch index 0d42c0383..ad6033e76 100644 --- a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch +++ b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch @@ -1,11 +1,11 @@ -From d6c7cf72d4289db7fc77d417f01ee01abc99b960 Mon Sep 17 00:00:00 2001 +From 769a0228d72e5f65cdca22bc8b1eb8290804d9a8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 27 Sep 2015 01:18:02 -0400 Subject: [PATCH] handle NaN health/absorb values and repair bad data diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1eca778d3..08d0728e1 100644 +index 1eca778d31..08d0728e16 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -496,7 +496,13 @@ public abstract class EntityLiving extends Entity { @@ -44,7 +44,7 @@ index 1eca778d3..08d0728e1 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2cdea9f5d..8688b727a 100644 +index 2cdea9f5d0..8688b727a3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1584,6 +1584,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -56,5 +56,5 @@ index 2cdea9f5d..8688b727a 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch index b78fafd90..1b05163b4 100644 --- a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch +++ b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch @@ -1,4 +1,4 @@ -From c25adbfda1a5f7777b14d60914fa241228983718 Mon Sep 17 00:00:00 2001 +From e38cfcffa3e993f204bb3951d7fa7237fc9f578e Mon Sep 17 00:00:00 2001 From: Gabscap Date: Sat, 19 Mar 2016 22:25:11 +0100 Subject: [PATCH] Waving banner workaround @@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround This patch is a workaround for MC-63720 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java -index 88c3d7efa..15af5927f 100644 +index 88c3d7efaf..15af5927f3 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java @@ -4,7 +4,13 @@ import java.io.IOException; @@ -34,5 +34,5 @@ index 88c3d7efa..15af5927f 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch index c65d001b4..46fcec05c 100644 --- a/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 21c88e53a02069dab8e9e1606d4c6d62eeac08ff Mon Sep 17 00:00:00 2001 +From ceb3bdbb547c9e9eb98001df882d471e3954e899 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d95d9c7203..4f81321b94 100644 +index 46c227b7f0..e721053542 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -58,6 +58,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -41,5 +41,5 @@ index d95d9c7203..4f81321b94 100644 this.justCreated = true; this.uniqueID = MathHelper.a(this.random); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch index d934f78ba..5e1554dd0 100644 --- a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch +++ b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch @@ -1,4 +1,4 @@ -From 35098d52136374f24614dff5fc274a738a65a358 Mon Sep 17 00:00:00 2001 +From b4f0c7aa46a509236ce5bf3606b5f13280c2be6b Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 22 Mar 2016 12:04:28 -0500 Subject: [PATCH] Configurable spawn chances for skeleton horses @@ -22,7 +22,7 @@ index 7de7b74ff6..6ef0e1399e 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 4309a7d07a..47d177b13d 100644 +index a34df8ce5d..96ed2da1f8 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -449,7 +449,7 @@ public class WorldServer extends World { @@ -35,5 +35,5 @@ index 4309a7d07a..47d177b13d 100644 if (flag1) { EntityHorseSkeleton entityhorseskeleton = (EntityHorseSkeleton) EntityTypes.SKELETON_HORSE.a((World) this); -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch index 3e53aafd1..8fd4118b1 100644 --- a/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch +++ b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch @@ -1,4 +1,4 @@ -From ad7babe3efdc1b799a999c0fcf8e4d3f49344752 Mon Sep 17 00:00:00 2001 +From fd4126fd147f51c856b36c021edea2594bfd3458 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 02:07:55 -0600 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling @@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward. Optimize getType and getBlockData to manually inline and optimize the calls diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index a3b5793e4..71089442c 100644 +index a3b5793e48..71089442c1 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -13,6 +13,14 @@ public class BaseBlockPosition implements Comparable { @@ -31,7 +31,7 @@ index a3b5793e4..71089442c 100644 public BaseBlockPosition(int i, int j, int k) { this.a = i; diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index f3d20f214..ee94f59e6 100644 +index f3d20f214d..ee94f59e64 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -208,12 +208,24 @@ public class Chunk implements IChunkAccess { @@ -64,7 +64,7 @@ index f3d20f214..ee94f59e6 100644 IBlockData iblockdata = null; diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java -index 652067757..0d5deee36 100644 +index 652067757a..0d5deee365 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -9,7 +9,7 @@ public class ChunkSection { @@ -77,7 +77,7 @@ index 652067757..0d5deee36 100644 public ChunkSection(int i) { this(i, (short) 0, (short) 0, (short) 0); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index c2039d0e4..502da7f52 100644 +index c2039d0e46..502da7f52d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -171,11 +171,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -95,5 +95,5 @@ index c2039d0e4..502da7f52 100644 public static boolean b(int i) { -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch index 1e4521b74..6c3e8b3cc 100644 --- a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch +++ b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch @@ -1,11 +1,11 @@ -From 664236ee844d81bf401718acc5806c827a160fac Mon Sep 17 00:00:00 2001 +From 39325403280c86ba742dfa67100a6d15d5e45d05 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sun, 20 Mar 2016 06:45:01 -0400 Subject: [PATCH] Access items by EquipmentSlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java -index 5873b7623..ef4cd7a7b 100644 +index 5873b76236..ef4cd7a7b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java @@ -268,4 +268,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i @@ -64,5 +64,5 @@ index 5873b7623..ef4cd7a7b 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch index e5c5f82f0..52e502da5 100644 --- a/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch +++ b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch @@ -1,4 +1,4 @@ -From 33a190ae43bb39273a3b5ae1a07d6cd7986e3cbf Mon Sep 17 00:00:00 2001 +From 105d542538802f184f616b4b5de2737a2e365b94 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener @@ -6,7 +6,7 @@ Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener Saves on some object allocation and processing when no plugin listens to this diff --git a/src/main/java/net/minecraft/server/BlockPlant.java b/src/main/java/net/minecraft/server/BlockPlant.java -index ed1da4f4b..a6891b9fa 100644 +index ed1da4f4ba..a6891b9fa7 100644 --- a/src/main/java/net/minecraft/server/BlockPlant.java +++ b/src/main/java/net/minecraft/server/BlockPlant.java @@ -16,7 +16,7 @@ public class BlockPlant extends Block { @@ -19,7 +19,7 @@ index ed1da4f4b..a6891b9fa 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockTallPlant.java b/src/main/java/net/minecraft/server/BlockTallPlant.java -index 42e86881b..6cdce1158 100644 +index 42e86881bd..6cdce11581 100644 --- a/src/main/java/net/minecraft/server/BlockTallPlant.java +++ b/src/main/java/net/minecraft/server/BlockTallPlant.java @@ -55,7 +55,7 @@ public class BlockTallPlant extends BlockPlant { @@ -32,7 +32,7 @@ index 42e86881b..6cdce1158 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3d580a666..3094f763b 100644 +index 3d580a666b..3094f763ba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1142,6 +1142,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 502da7f52..83f9ea88f 100644 +index 502da7f52d..83f9ea88f3 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -367,7 +367,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -66,7 +66,7 @@ index 502da7f52..83f9ea88f 100644 this.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a9631c5d2..b7efcb860 100644 +index 96ed2da1f8..9d0edf5382 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -75,6 +75,7 @@ public class WorldServer extends World { @@ -78,5 +78,5 @@ index a9631c5d2..b7efcb860 100644 // Add env and gen to constructor public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) { -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch index 692b89b76..dd851547b 100644 --- a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch +++ b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch @@ -1,4 +1,4 @@ -From e7c4bd8bdfdae92f7a47353b1b3a1bd50721f93f Mon Sep 17 00:00:00 2001 +From 69b72c17aec54133659cc54dc67c05c0c271bb93 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:32:58 -0400 Subject: [PATCH] Entity AddTo/RemoveFrom World Events @@ -26,5 +26,5 @@ index 9d0edf5382..fd42f34004 100644 } -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch index 8c42db200..fa335e91a 100644 --- a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch +++ b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch @@ -1,4 +1,4 @@ -From f2b28db6cbd7289df74c913e2b2f275eb530c031 Mon Sep 17 00:00:00 2001 +From 49a9b3de50816606bae0d2754c46d367f3df171d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 20:46:14 -0400 Subject: [PATCH] Configurable Chunk Inhabited Time @@ -11,7 +11,7 @@ For people who want all chunks to be treated equally, you can chose a fixed valu This allows to fine-tune vanilla gameplay. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 6ef0e1399..5872e6b17 100644 +index 6ef0e1399e..5872e6b171 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -236,4 +236,14 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index 6ef0e1399..5872e6b17 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index ee94f59e6..4fe36bb71 100644 +index ee94f59e64..4fe36bb71d 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -842,7 +842,7 @@ public class Chunk implements IChunkAccess { @@ -43,5 +43,5 @@ index ee94f59e6..4fe36bb71 100644 @Override -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch index 96267e56c..092422b87 100644 --- a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch +++ b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch @@ -1,4 +1,4 @@ -From 139aa286339e8d2dda51c5ea1a2b02d899c1a76d Mon Sep 17 00:00:00 2001 +From a950dfc0c5d9101c836264e6da1b84cee9af940d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 28 Mar 2016 21:22:26 -0400 Subject: [PATCH] EntityPathfindEvent @@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent Fires when an Entity decides to start moving to a location. diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java -index 3fdeda0ce..abf450917 100644 +index 3fdeda0cea..abf450917e 100644 --- a/src/main/java/net/minecraft/server/Navigation.java +++ b/src/main/java/net/minecraft/server/Navigation.java @@ -60,7 +60,7 @@ public class Navigation extends NavigationAbstract { @@ -19,7 +19,7 @@ index 3fdeda0ce..abf450917 100644 private int t() { diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index a600ee765..5e7158ba1 100644 +index a600ee7654..5e7158ba10 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -8,7 +8,7 @@ import javax.annotation.Nullable; @@ -85,7 +85,7 @@ index a600ee765..5e7158ba1 100644 float f = (float) this.p.getValue(); BlockPosition blockposition = flag ? (new BlockPosition(this.a)).up() : new BlockPosition(this.a); diff --git a/src/main/java/net/minecraft/server/NavigationFlying.java b/src/main/java/net/minecraft/server/NavigationFlying.java -index 5b057e96d..f16c6d1fa 100644 +index 5b057e96db..f16c6d1faa 100644 --- a/src/main/java/net/minecraft/server/NavigationFlying.java +++ b/src/main/java/net/minecraft/server/NavigationFlying.java @@ -25,7 +25,7 @@ public class NavigationFlying extends NavigationAbstract { @@ -98,5 +98,5 @@ index 5b057e96d..f16c6d1fa 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch b/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch index d71bacc5e..0f35ac811 100644 --- a/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch +++ b/Spigot-Server-Patches/0078-Sanitise-RegionFileCache-and-make-configurable.patch @@ -1,4 +1,4 @@ -From f33920c8054472e73f9e712da3d32a5b34469cf2 Mon Sep 17 00:00:00 2001 +From 39a4494332f1f9e6da9a37371eda0523611336f5 Mon Sep 17 00:00:00 2001 From: Antony Riley Date: Tue, 29 Mar 2016 08:22:55 +0300 Subject: [PATCH] Sanitise RegionFileCache and make configurable. @@ -11,7 +11,7 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap). The maximum size of the RegionFileCache is also made configurable. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 6ef5bb9f3..d500cd75a 100644 +index 6ef5bb9f32..d500cd75a9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -218,4 +218,9 @@ public class PaperConfig { @@ -25,7 +25,7 @@ index 6ef5bb9f3..d500cd75a 100644 + } } diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 2fe27b460..57ce53cfd 100644 +index 2fe27b460d..57ce53cfdc 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -25,7 +25,7 @@ public final class RegionFileCache implements AutoCloseable { @@ -38,5 +38,5 @@ index 2fe27b460..57ce53cfd 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch b/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch index 9eb416696..28318b2ad 100644 --- a/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch +++ b/Spigot-Server-Patches/0079-Do-not-load-chunks-for-Pathfinding.patch @@ -1,11 +1,11 @@ -From 2be2bc274a4a0279e51ed0e5528ae64e613d8b3f Mon Sep 17 00:00:00 2001 +From d633e665eee335b9034539c79130481e1cdaebf4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 31 Mar 2016 19:17:58 -0400 Subject: [PATCH] Do not load chunks for Pathfinding diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java -index 53c15c1c0..29c66b983 100644 +index 53c15c1c0b..29c66b983d 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -27,7 +27,7 @@ public class ChunkCache implements IBlockAccess, ICollisionAccess { @@ -18,7 +18,7 @@ index 53c15c1c0..29c66b983 100644 } diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 5e7158ba1..39a0c45bb 100644 +index 5e7158ba10..39a0c45bb0 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -28,7 +28,7 @@ public abstract class NavigationAbstract { @@ -31,7 +31,7 @@ index 5e7158ba1..39a0c45bb 100644 public NavigationAbstract(EntityInsentient entityinsentient, World world) { this.g = Vec3D.a; diff --git a/src/main/java/net/minecraft/server/Pathfinder.java b/src/main/java/net/minecraft/server/Pathfinder.java -index 619957061..67c63cfe3 100644 +index 6199570618..67c63cfe33 100644 --- a/src/main/java/net/minecraft/server/Pathfinder.java +++ b/src/main/java/net/minecraft/server/Pathfinder.java @@ -19,7 +19,7 @@ public class Pathfinder { @@ -44,7 +44,7 @@ index 619957061..67c63cfe3 100644 public Pathfinder(PathfinderAbstract pathfinderabstract, int i) { this.e = pathfinderabstract; diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java -index ef248ebcc..4240ca81c 100644 +index ef248ebcc4..4240ca81cb 100644 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java @@ -365,7 +365,8 @@ public class PathfinderNormal extends PathfinderAbstract { @@ -83,5 +83,5 @@ index ef248ebcc..4240ca81c 100644 Material material = iblockdata.getMaterial(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch index 513bc620a..d7017f3db 100644 --- a/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch +++ b/Spigot-Server-Patches/0080-Add-PlayerUseUnknownEntityEvent.patch @@ -1,11 +1,11 @@ -From 087616ee503fcb696a72c674f4b06b6dcc0984ee Mon Sep 17 00:00:00 2001 +From 9effd94a85d6e6956b1c23a0770d912a9109c178 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 05:09:16 -0400 Subject: [PATCH] Add PlayerUseUnknownEntityEvent diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java -index 680adbdeb..3f7697b39 100644 +index 680adbdeb0..3f7697b39c 100644 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; @@ -18,7 +18,7 @@ index 680adbdeb..3f7697b39 100644 private Vec3D c; private EnumHand d; diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 3c8c9c9cd..505189c82 100644 +index 3c8c9c9cd4..505189c82b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1912,6 +1912,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -39,5 +39,5 @@ index 3c8c9c9cd..505189c82 100644 } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch b/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch index 4b734c7a8..35d7c9357 100644 --- a/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch +++ b/Spigot-Server-Patches/0081-Fix-reducedDebugInfo-not-initialized-on-client.patch @@ -1,11 +1,11 @@ -From d458f33876ae84c9bb64e53c1da195149015d1ab Mon Sep 17 00:00:00 2001 +From 6239d721ea0a07c1255154119b2cc27a9a3d0197 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 2 Apr 2016 20:37:03 -0400 Subject: [PATCH] Fix reducedDebugInfo not initialized on client diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 948a6e3b7..05ea0ace5 100644 +index 948a6e3b7a..05ea0ace58 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -163,6 +163,7 @@ public abstract class PlayerList { @@ -17,5 +17,5 @@ index 948a6e3b7..05ea0ace5 100644 entityplayer.getStatisticManager().c(); entityplayer.B().a(entityplayer); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch b/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch index 6ea00c722..30a6a0f1e 100644 --- a/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch +++ b/Spigot-Server-Patches/0082-Configurable-Grass-Spread-Tick-Rate.patch @@ -1,11 +1,11 @@ -From 10137f18711c301c13f21a41fc205c5877cbcf2b Mon Sep 17 00:00:00 2001 +From d72aac0ac63b4642cbbc18a52998675af8819a37 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 16:28:17 -0400 Subject: [PATCH] Configurable Grass Spread Tick Rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 5872e6b17..47f5f8055 100644 +index 5872e6b171..47f5f8055e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -246,4 +246,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 5872e6b17..47f5f8055 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java -index 9b25fc2f9..2b19b6754 100644 +index 9b25fc2f9e..2b19b6754a 100644 --- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java +++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java @@ -29,6 +29,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow { @@ -32,5 +32,5 @@ index 9b25fc2f9..2b19b6754 100644 // CraftBukkit start if (org.bukkit.craftbukkit.event.CraftEventFactory.callBlockFadeEvent(worldserver, blockposition, Blocks.DIRT.getBlockData()).isCancelled()) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch b/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch index 53d5f59f3..93d3f3c8e 100644 --- a/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch +++ b/Spigot-Server-Patches/0083-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch @@ -1,11 +1,11 @@ -From 49d1e2880a86cc29f82af932fefd5f931621652f Mon Sep 17 00:00:00 2001 +From 0925ac03e9d71b629cd48ff9aad501291c0540e8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 17:48:50 -0400 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 83f9ea88f..9672248c7 100644 +index 83f9ea88f3..9672248c7c 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -437,6 +437,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -17,5 +17,5 @@ index 83f9ea88f..9672248c7 100644 this.a(blockposition.east(), block, blockposition); this.a(blockposition.down(), block, blockposition); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch b/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch index b7b085dc3..3e3428d75 100644 --- a/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch +++ b/Spigot-Server-Patches/0084-Remove-Debug-checks-from-DataBits.patch @@ -1,4 +1,4 @@ -From 1143db7ba761c06a82f9e521d6821bd40cb48360 Mon Sep 17 00:00:00 2001 +From d1a4229370738cee1572ff2cd6283295bb074d91 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Apr 2016 21:38:58 -0400 Subject: [PATCH] Remove Debug checks from DataBits @@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png After: http://i.imgur.com/nJ46crB.png diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java -index 2edd9b871..f9680b683 100644 +index 2edd9b8714..f9680b6830 100644 --- a/src/main/java/net/minecraft/server/DataBits.java +++ b/src/main/java/net/minecraft/server/DataBits.java @@ -15,7 +15,7 @@ public class DataBits { @@ -53,5 +53,5 @@ index 2edd9b871..f9680b683 100644 int k = j >> 6; int l = (i + 1) * this.b - 1 >> 6; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch index f4aad8063..43e9f8a45 100644 --- a/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch +++ b/Spigot-Server-Patches/0085-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch @@ -1,4 +1,4 @@ -From 1d29077967f0ec4dc5840ab8f2b420029bde1c9f Mon Sep 17 00:00:00 2001 +From ac7e2a5e3c1f068bb3cf18debfefb11d9fa80d31 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 6 Apr 2016 01:04:23 -0500 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names @@ -12,7 +12,7 @@ for this on CB at one point but I can't find it. We may need to do this ourselves at some point in the future. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 47f5f8055..b1d1a3c1f 100644 +index 47f5f8055e..b1d1a3c1f8 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -252,4 +252,9 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 47f5f8055..b1d1a3c1f 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 505189c82..669d9a41d 100644 +index 505189c82b..669d9a41d6 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1648,7 +1648,16 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -48,7 +48,7 @@ index 505189c82..669d9a41d 100644 if (((LazyPlayerSet) event.getRecipients()).isLazy()) { for (Object recipient : minecraftServer.getPlayerList().players) { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 05ea0ace5..94a24a49c 100644 +index 05ea0ace58..94a24a49cf 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -178,7 +178,7 @@ public abstract class PlayerList { @@ -61,5 +61,5 @@ index 05ea0ace5..94a24a49c 100644 playerconnection.a(entityplayer.locX(), entityplayer.locY(), entityplayer.locZ(), entityplayer.yaw, entityplayer.pitch); this.players.add(entityplayer); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch b/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch index 987b6f3d0..001419d37 100644 --- a/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch +++ b/Spigot-Server-Patches/0086-Workaround-for-setting-passengers-on-players.patch @@ -1,4 +1,4 @@ -From 6799e6163cba87bf172a941184d8716b3da5fa8c Mon Sep 17 00:00:00 2001 +From d637263813198dc061262a0312b5042cf47e4f1c Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 10 Apr 2016 03:23:32 -0500 Subject: [PATCH] Workaround for setting passengers on players @@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players SPIGOT-1915 & GH-114 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 8688b727a..5647eb135 100644 +index 8688b727a3..5647eb135e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -769,6 +769,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -28,5 +28,5 @@ index 8688b727a..5647eb135 100644 public void setSneaking(boolean sneak) { getHandle().setSneaking(sneak); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch b/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch index 6c2ddd108..d46f9c4e8 100644 --- a/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch +++ b/Spigot-Server-Patches/0087-Remove-unused-World-Tile-Entity-List.patch @@ -1,4 +1,4 @@ -From 77aec9ad41160932726decb27ba49c3f1b7a485d Mon Sep 17 00:00:00 2001 +From 19acaef36982407bd7db3af13755691bbdff1bc2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:25:28 -0400 Subject: [PATCH] Remove unused World Tile Entity List @@ -89,5 +89,5 @@ index fd42f34004..6f66c38650 100644 while (iterator.hasNext()) { TileEntity tileentity = (TileEntity) iterator.next(); -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch b/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch index 7b00c355c..3fd9ae06e 100644 --- a/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch +++ b/Spigot-Server-Patches/0088-Don-t-tick-Skulls-unused-code.patch @@ -1,11 +1,11 @@ -From 966b1f2e49ba52fc3f69e567df734e2db2623677 Mon Sep 17 00:00:00 2001 +From aa3c85e73540652a7d9b073ac2b44496dd00f1a4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 00:30:10 -0400 Subject: [PATCH] Don't tick Skulls - unused code diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 99442bb13..177cceb77 100644 +index 99442bb130..177cceb77f 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback; @@ -27,5 +27,5 @@ index 99442bb13..177cceb77 100644 Block block = this.getBlock().getBlock(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch index 29bf0a21a..2963e2705 100644 --- a/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0089-Configurable-Player-Collision.patch @@ -1,11 +1,11 @@ -From 51a8cb2552bb9d8bea3c784b46500428e0c9c86b Mon Sep 17 00:00:00 2001 +From 478a1cb26f452aee2f9a97f6627d050c240e7f89 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index d500cd75a..e4f0db64c 100644 +index d500cd75a9..e4f0db64c0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -223,4 +223,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index d500cd75a..e4f0db64c 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3094f763b..deffa2ddb 100644 +index 3094f763ba..deffa2ddbd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -454,6 +454,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 13 Apr 2016 20:21:38 -0700 Subject: [PATCH] Add handshake event to allow plugins to handle client @@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 963dbd064..d0b9c6e3d 100644 +index 963dbd0648..d0b9c6e3dc 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -73,8 +73,33 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -45,5 +45,5 @@ index 963dbd064..d0b9c6e3d 100644 if ( split.length == 3 || split.length == 4 ) { packethandshakinginsetprotocol.hostname = split[0]; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch b/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch index 55341e415..7a261e84a 100644 --- a/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch +++ b/Spigot-Server-Patches/0091-Configurable-RCON-IP-address.patch @@ -1,4 +1,4 @@ -From 0bfe46238985e32e6f2b732447aac7a0fbadc027 Mon Sep 17 00:00:00 2001 +From fc59bfa96e3a3c9ebcadd8f640334476a4925fa5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 16 Apr 2016 00:39:33 -0400 Subject: [PATCH] Configurable RCON IP address @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address For servers with multiple IP's, ability to bind to a specific interface. diff --git a/src/main/java/net/minecraft/server/DedicatedServerProperties.java b/src/main/java/net/minecraft/server/DedicatedServerProperties.java -index ad1e3508a..0c3ec8357 100644 +index ad1e3508a7..0c3ec83570 100644 --- a/src/main/java/net/minecraft/server/DedicatedServerProperties.java +++ b/src/main/java/net/minecraft/server/DedicatedServerProperties.java @@ -54,6 +54,8 @@ public class DedicatedServerProperties extends PropertyManager> { @@ -45,7 +45,7 @@ index d7e81a6d9..729455ce5 100644 } diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java -index e48d6dcd7..2ce490be0 100644 +index e48d6dcd74..2ce490be00 100644 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java @@ -25,7 +25,7 @@ public class RemoteControlListener extends RemoteConnectionThread { @@ -58,5 +58,5 @@ index e48d6dcd7..2ce490be0 100644 this.i = "0.0.0.0"; } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch b/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch index 95750e298..e947ba956 100644 --- a/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0092-Prevent-Fire-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From ff45fd6abb41459f6ee61488053d80d6495c40f2 Mon Sep 17 00:00:00 2001 +From 936235464e3c34bcc31d059836bcf5f37b3e3f18 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Apr 2016 17:27:09 -0400 Subject: [PATCH] Prevent Fire from loading chunks @@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall bad behavior. diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 2909f78f8..0ece78d4d 100644 +index 2909f78f87..0ece78d4dc 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -163,6 +163,7 @@ public class BlockFire extends Block { @@ -53,5 +53,5 @@ index 2909f78f8..0ece78d4d 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch index a8583bba0..211541e6a 100644 --- a/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch +++ b/Spigot-Server-Patches/0093-Implement-PlayerLocaleChangeEvent.patch @@ -1,4 +1,4 @@ -From f5359af1e1a41db39a22219987cd988c7e4c227f Mon Sep 17 00:00:00 2001 +From ad04c3909a4d9d77aa6f5d0e9865168591ea8fdf Mon Sep 17 00:00:00 2001 From: Isaac Moore Date: Tue, 19 Apr 2016 14:09:31 -0500 Subject: [PATCH] Implement PlayerLocaleChangeEvent @@ -65,5 +65,5 @@ index 5647eb135e..447ecf636d 100644 { Set ret = new HashSet(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch b/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch index 8e897ac09..043ef3642 100644 --- a/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch +++ b/Spigot-Server-Patches/0094-EntityRegainHealthEvent-isFastRegen-API.patch @@ -1,4 +1,4 @@ -From 959c74cd7de5d0340edbcd7f365d14d7ce7950c1 Mon Sep 17 00:00:00 2001 +From aebbf2369275f889e42f0a4e16f0ae16bcc462a6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 22 Apr 2016 01:43:11 -0500 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API Don't even get me started diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 08d0728e1..dd1caec9d 100644 +index 08d0728e16..dd1caec9da 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -924,10 +924,16 @@ public abstract class EntityLiving extends Entity { @@ -28,7 +28,7 @@ index 08d0728e1..dd1caec9d 100644 if (this.valid) { this.world.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java -index 01d702d5c..c3a9a9bd4 100644 +index 01d702d5ca..c3a9a9bd45 100644 --- a/src/main/java/net/minecraft/server/FoodMetaData.java +++ b/src/main/java/net/minecraft/server/FoodMetaData.java @@ -69,7 +69,7 @@ public class FoodMetaData { @@ -41,5 +41,5 @@ index 01d702d5c..c3a9a9bd4 100644 this.foodTickTimer = 0; } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch b/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch index 785adadca..50c9fe844 100644 --- a/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch +++ b/Spigot-Server-Patches/0095-Add-ability-to-configure-frosted_ice-properties.patch @@ -1,11 +1,11 @@ -From e6d0c96e08e21c3bca5bf86573d993ff541e1963 Mon Sep 17 00:00:00 2001 +From 44de22c81f2c3d70bf81b5808bf3503756d037b4 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 21 Apr 2016 23:51:55 -0700 Subject: [PATCH] Add ability to configure frosted_ice properties diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b1d1a3c1f..9e0c48954 100644 +index b1d1a3c1f8..9e0c489540 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -257,4 +257,14 @@ public class PaperWorldConfig { @@ -24,7 +24,7 @@ index b1d1a3c1f..9e0c48954 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index af17aba8b..5e414138e 100644 +index af17aba8b8..5e414138e4 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -13,6 +13,7 @@ public class BlockIceFrost extends BlockIce { @@ -54,5 +54,5 @@ index af17aba8b..5e414138e 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch index 2b96462cd..d66897864 100644 --- a/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0096-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 6e2d54dddc8e295098bb5d4afdd38e777ef62fc3 Mon Sep 17 00:00:00 2001 +From 01b59448b29692a6c98d7249eb5f9d5e9132506a Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton to stop IDE complaining about potential NPE diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index deffa2ddb..f45c65877 100644 +index deffa2ddbd..f45c658770 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -68,6 +68,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot @@ -35,5 +35,5 @@ index deffa2ddb..f45c65877 100644 // CraftBukkit end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch index ee40ea128..9320fc455 100644 --- a/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch +++ b/Spigot-Server-Patches/0097-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch @@ -1,4 +1,4 @@ -From 5a352e939e763bd487f3d7e9eb075e108875e264 Mon Sep 17 00:00:00 2001 +From a51e20fdf53d15d38e1783e89d23329066072d24 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Apr 2016 20:02:00 -0400 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes @@ -127,5 +127,5 @@ index 256a131781..5768cd512e 100644 public RenderData() { -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch b/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch index 457bf2a7b..abbc6af30 100644 --- a/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch +++ b/Spigot-Server-Patches/0098-LootTable-API-Replenishable-Lootables-Feature.patch @@ -1,4 +1,4 @@ -From 768ddfda8040f7a73213932aebaca404ce901518 Mon Sep 17 00:00:00 2001 +From b51b20397015731c3d7bf2b9905d14c1116c76ab Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 1 May 2016 21:19:14 -0400 Subject: [PATCH] LootTable API & Replenishable Lootables Feature @@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players do not suffer with "Every chest has been looted" diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 9e0c48954..6db131203 100644 +index 9e0c489540..6db1312035 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -267,4 +267,26 @@ public class PaperWorldConfig { @@ -43,7 +43,7 @@ index 9e0c48954..6db131203 100644 } diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java new file mode 100644 -index 000000000..d6fce3112 +index 0000000000..d6fce3112e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableBlockInventory.java @@ -0,0 +1,33 @@ @@ -82,7 +82,7 @@ index 000000000..d6fce3112 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java new file mode 100644 -index 000000000..5e637782d +index 0000000000..5e637782d5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableEntityInventory.java @@ -0,0 +1,28 @@ @@ -116,7 +116,7 @@ index 000000000..5e637782d +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java new file mode 100644 -index 000000000..856843fc9 +index 0000000000..856843fc91 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventory.java @@ -0,0 +1,71 @@ @@ -193,7 +193,7 @@ index 000000000..856843fc9 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java new file mode 100644 -index 000000000..b5401eaf9 +index 0000000000..b5401eaf97 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperLootableInventoryData.java @@ -0,0 +1,179 @@ @@ -378,7 +378,7 @@ index 000000000..b5401eaf9 +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java new file mode 100644 -index 000000000..f9fbc221b +index 0000000000..f9fbc221bd --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperMinecartLootableInventory.java @@ -0,0 +1,64 @@ @@ -448,7 +448,7 @@ index 000000000..f9fbc221b +} diff --git a/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java new file mode 100644 -index 000000000..d50410532 +index 0000000000..d50410532c --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/loottable/PaperTileEntityLootableInventory.java @@ -0,0 +1,67 @@ @@ -520,7 +520,7 @@ index 000000000..d50410532 + } +} diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 6fe4e85d9..9157de0f5 100644 +index e721053542..4fd0e54de7 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -73,6 +73,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -532,7 +532,7 @@ index 6fe4e85d9..9157de0f5 100644 public CraftEntity getBukkitEntity() { diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java -index 34ceace23..60efd439a 100644 +index 34ceace23f..60efd439af 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java @@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp @@ -591,7 +591,7 @@ index 34ceace23..60efd439a 100644 if (entityhuman != null) { diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java -index f5316a404..d4cbce324 100644 +index f5316a4045..d4cbce3243 100644 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java @@ -6,8 +6,9 @@ import javax.annotation.Nullable; @@ -646,7 +646,7 @@ index f5316a404..d4cbce324 100644 if (entityhuman != null) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 283141944..17d80b5c6 100644 +index 2831419446..17d80b5c6e 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -64,7 +64,7 @@ public class CraftBlockEntityState extends CraftBlockState @@ -659,7 +659,7 @@ index 283141944..17d80b5c6 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java -index 6beb99262..019fa7118 100644 +index 6beb992622..019fa71181 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java @@ -11,8 +11,9 @@ import org.bukkit.craftbukkit.CraftWorld; @@ -674,7 +674,7 @@ index 6beb99262..019fa7118 100644 public CraftChest(final Block block) { super(block, TileEntityChest.class); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java -index e1ad26a24..678aa09d4 100644 +index e1ad26a242..678aa09d47 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftLootable.java @@ -1,5 +1,6 @@ @@ -703,7 +703,7 @@ index e1ad26a24..678aa09d4 100644 getSnapshot().setLootTable(key, seed); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java -index e05624e64..ab4807b2c 100644 +index e05624e643..ab4807b2cd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java @@ -1,5 +1,6 @@ @@ -723,7 +723,7 @@ index e05624e64..ab4807b2c 100644 public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java -index 2d776b520..fcc978784 100644 +index 2d776b520b..fcc9787848 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java @@ -47,7 +47,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo @@ -736,7 +736,7 @@ index 2d776b520..fcc978784 100644 getHandle().setLootTable(newKey, seed); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java -index 334bd5bb3..f5b31237f 100644 +index 334bd5bb3f..f5b31237fc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java @@ -1,5 +1,6 @@ @@ -756,5 +756,5 @@ index 334bd5bb3..f5b31237f 100644 public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch b/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch index ec49cb66e..9d5280425 100644 --- a/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch +++ b/Spigot-Server-Patches/0099-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch @@ -1,11 +1,11 @@ -From 5f5a1708e434f8f6483ec908c404f2dd456f0d69 Mon Sep 17 00:00:00 2001 +From 1b034a1522ff6477cdba7cf9adc8a6feeeda8a6e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 May 2016 23:33:08 -0400 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index e4f0db64c..67f35fe66 100644 +index e4f0db64c0..67f35fe66b 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -228,4 +228,9 @@ public class PaperConfig { @@ -19,7 +19,7 @@ index e4f0db64c..67f35fe66 100644 + } } diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java -index 1eab0c310..6bf66972f 100644 +index 1eab0c310d..6bf66972f9 100644 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java @@ -174,6 +174,7 @@ public class PersistentScoreboard extends PersistentBase { @@ -31,5 +31,5 @@ index 1eab0c310..6bf66972f 100644 nbttagcompound.setString("Name", scoreboardteam.getName()); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch b/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch index 7e71de422..0bbac2c2f 100644 --- a/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch +++ b/Spigot-Server-Patches/0100-System-property-for-disabling-watchdoge.patch @@ -1,11 +1,11 @@ -From d0c56d4f2d5aca382f551386c18fea7726c654c6 Mon Sep 17 00:00:00 2001 +From 130742bebac4a56a634d1f36cb556b2472e15793 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 12 May 2016 23:02:58 -0500 Subject: [PATCH] System property for disabling watchdoge diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index d96100061..121c7ff60 100644 +index d961000611..121c7ff601 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -57,7 +57,7 @@ public class WatchdogThread extends Thread @@ -18,5 +18,5 @@ index d96100061..121c7ff60 100644 Logger log = Bukkit.getServer().getLogger(); log.log( Level.SEVERE, "------------------------------" ); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch index 625ae4ecd..c3d4fe3d4 100644 --- a/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0101-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From 84457c5734836495012f766a1fd8ca4d96081da7 Mon Sep 17 00:00:00 2001 +From 42a7de04cb2af799968c585b59635d5e9814a12f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase the user never changed the default setting for Spigot's save on stop only. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f45c65877..bdc98d12c 100644 +index f45c658770..bdc98d12c6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -760,7 +760,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 16 May 2016 23:19:16 -0400 Subject: [PATCH] Avoid blocking on Network Manager creation @@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation Per Paper issue 294 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java -index e7e216850..37a22ba6f 100644 +index e7e2168508..37a22ba6f7 100644 --- a/src/main/java/net/minecraft/server/ServerConnection.java +++ b/src/main/java/net/minecraft/server/ServerConnection.java @@ -39,6 +39,15 @@ public class ServerConnection { diff --git a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch b/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch index fa6e96073..92c2eed41 100644 --- a/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch +++ b/Spigot-Server-Patches/0103-Optional-TNT-doesn-t-move-in-water.patch @@ -1,4 +1,4 @@ -From 93f7f9414406e2d8224158f030941cf06e413433 Mon Sep 17 00:00:00 2001 +From 4d627b0070525fda368462b3f7d05db763e3dbb3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 22 May 2016 20:20:55 -0500 Subject: [PATCH] Optional TNT doesn't move in water diff --git a/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch b/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch index 32b45556c..ac12510ed 100644 --- a/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch +++ b/Spigot-Server-Patches/0104-Faster-redstone-torch-rapid-clock-removal.patch @@ -1,4 +1,4 @@ -From bc50c0aadcb61ddd8eca71d95c64bea7dc5f06a0 Mon Sep 17 00:00:00 2001 +From f2dd438fb714b40068d2c0abed509fc95dc8ecd1 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Mon, 23 May 2016 12:12:37 +0200 Subject: [PATCH] Faster redstone torch rapid clock removal @@ -6,7 +6,7 @@ Subject: [PATCH] Faster redstone torch rapid clock removal Only resize the the redstone torch list once, since resizing arrays / lists is costly diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java -index 98a255ae5..4c3062ece 100644 +index 98a255ae57..4c3062ece9 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java @@ -11,7 +11,7 @@ import org.bukkit.event.block.BlockRedstoneEvent; // CraftBukkit @@ -77,7 +77,7 @@ index 98a255ae5..4c3062ece 100644 public RedstoneUpdateInfo(BlockPosition blockposition, long i) { this.a = blockposition; diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1dccc2e0d..05ee02c4c 100644 +index 1dccc2e0dd..05ee02c4c2 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -84,6 +84,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -89,5 +89,5 @@ index 1dccc2e0d..05ee02c4c 100644 public CraftWorld getWorld() { return this.world; -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch b/Spigot-Server-Patches/0105-Add-server-name-parameter.patch index 7d4df22ef..c24eadc57 100644 --- a/Spigot-Server-Patches/0105-Add-server-name-parameter.patch +++ b/Spigot-Server-Patches/0105-Add-server-name-parameter.patch @@ -1,11 +1,11 @@ -From 5c109a39c1e11c268d1c4e8f683a25e3b6709e3c Mon Sep 17 00:00:00 2001 +From d1ba8576073b4203c6c32b8c7119a18718089c56 Mon Sep 17 00:00:00 2001 From: Martin Panzer Date: Sat, 28 May 2016 16:54:03 +0200 Subject: [PATCH] Add server-name parameter diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index ea7d9f1d0..40e7c895c 100644 +index ba0fe4ae2c..93fcfd5f39 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -137,6 +137,14 @@ public class Main { @@ -24,5 +24,5 @@ index ea7d9f1d0..40e7c895c 100644 }; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch b/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch index 79edec6de..8091a4738 100644 --- a/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch +++ b/Spigot-Server-Patches/0106-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch @@ -1,4 +1,4 @@ -From 2a7f56466e57511d1fd2ca9274f855a019c5a639 Mon Sep 17 00:00:00 2001 +From 23d12b3f23a7e5f6ef88d9035ea7de322de15a8c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world Also fix view distance lookup diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index e11ccdbd8..e0d240a89 100644 +index d4fd58414c..8762577696 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -572,8 +572,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -24,7 +24,7 @@ index e11ccdbd8..e0d240a89 100644 double deltaZ = this.locZ() - player.locZ(); double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 2edf466ee..2e95069c1 100644 +index 2edf466ee2..2e95069c19 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -207,8 +207,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -42,5 +42,5 @@ index 2edf466ee..2e95069c1 100644 double deltaZ = this.locZ() - player.locZ(); double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch b/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch index 8bd225f9e..10693c7e0 100644 --- a/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch +++ b/Spigot-Server-Patches/0107-Fix-Double-World-Add-issues.patch @@ -1,4 +1,4 @@ -From 61b790005fc01a2e5519c426d6ff0ac80e672f2b Mon Sep 17 00:00:00 2001 +From 980d7f83d54c8d4f311aa290850af45bc063ae21 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 21 Jun 2016 22:54:34 -0400 Subject: [PATCH] Fix Double World Add issues @@ -20,5 +20,5 @@ index 40c9cba760..3004270455 100644 // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit return false; -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch b/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch index 42002171c..13c90673e 100644 --- a/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch +++ b/Spigot-Server-Patches/0108-Fix-Old-Sign-Conversion.patch @@ -1,4 +1,4 @@ -From cf5b5fcf4e9af28f844a2c689178a29310b466db Mon Sep 17 00:00:00 2001 +From 4321a53c73a8eae0cb4ae25eb98f999c3ecd31b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 17 Jun 2016 20:50:11 -0400 Subject: [PATCH] Fix Old Sign Conversion @@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java -index dad966825..8c411ff07 100644 +index dad966825d..8c411ff074 100644 --- a/src/main/java/net/minecraft/server/DefinedStructure.java +++ b/src/main/java/net/minecraft/server/DefinedStructure.java @@ -203,9 +203,11 @@ public class DefinedStructure { @@ -25,7 +25,7 @@ index dad966825..8c411ff07 100644 } diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index e2f3cec74..630b27915 100644 +index e2f3cec742..630b279158 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -37,7 +37,7 @@ index e2f3cec74..630b27915 100644 @Nullable protected World world; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 4a48c09e9..03f6ddf00 100644 +index 4a48c09e96..03f6ddf000 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -55,13 +55,14 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // @@ -58,5 +58,5 @@ index 4a48c09e9..03f6ddf00 100644 if (this.world instanceof WorldServer) { try { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch b/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch index 710bba4b1..b13c0b9e7 100644 --- a/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch +++ b/Spigot-Server-Patches/0109-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch @@ -1,11 +1,11 @@ -From 4e581e04eb2450565558e23d4ae4e2fa225a704f Mon Sep 17 00:00:00 2001 +From 414e1da5db9df44fc30b74865132ce7174effe1d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 16 Jul 2016 19:11:17 -0500 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java -index d32bec70d..581199e6d 100644 +index d32bec70d0..581199e6dc 100644 --- a/src/main/java/net/minecraft/server/UserCache.java +++ b/src/main/java/net/minecraft/server/UserCache.java @@ -86,7 +86,7 @@ public class UserCache { @@ -18,5 +18,5 @@ index d32bec70d..581199e6d 100644 GameProfile gameprofile = new GameProfile(uuid, s); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch index 6ad1de69b..a5d82b1c7 100644 --- a/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch +++ b/Spigot-Server-Patches/0110-More-informative-vehicle-moved-wrongly-message.patch @@ -1,11 +1,11 @@ -From da7dfb51186a49d21d5bade2a16ea1cc2cec7699 Mon Sep 17 00:00:00 2001 +From a4a1ae77f7c296eb94d83adfc577512828e619da Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Jul 2016 17:58:53 -0500 Subject: [PATCH] More informative vehicle moved wrongly message diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8f182fcc8..53d201c59 100644 +index 669d9a41d6..7476f07aa1 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -365,7 +365,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index 8f182fcc8..53d201c59 100644 Location curPos = this.getPlayer().getLocation(); // Spigot -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch b/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch index 000499fda..77cf15013 100644 --- a/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch +++ b/Spigot-Server-Patches/0111-Re-track-players-that-dismount-from-other-players.patch @@ -1,4 +1,4 @@ -From 0c006970ef9bbf08b0d317a44df34104f25612e8 Mon Sep 17 00:00:00 2001 +From b0a3d2baf0878e99b5852b16ac314019ef009af7 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 31 Jul 2016 16:33:03 -0500 Subject: [PATCH] Re-track players that dismount from other players @@ -32,5 +32,5 @@ index d4bba876d0..ae1f0d5783 100644 public void a(double d0, boolean flag) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch b/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch index 68b30f3f8..42fb09070 100644 --- a/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch +++ b/Spigot-Server-Patches/0112-Add-setting-for-proxy-online-mode-status.patch @@ -1,11 +1,11 @@ -From d8e75a84e75581970efe872bb085fe0d3d896892 Mon Sep 17 00:00:00 2001 +From cf32bd46104a23ec0112f2f1b2ca50a45cbf832b Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 5 Aug 2016 01:03:08 +0200 Subject: [PATCH] Add setting for proxy online mode status diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 67f35fe66..53f96a157 100644 +index 67f35fe66b..53f96a1576 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException; @@ -31,7 +31,7 @@ index 67f35fe66..53f96a157 100644 + } } diff --git a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java -index 1422503e1..d3c2e1bed 100644 +index 1422503e11..d3c2e1bedf 100644 --- a/src/main/java/net/minecraft/server/NameReferencingFileConverter.java +++ b/src/main/java/net/minecraft/server/NameReferencingFileConverter.java @@ -58,7 +58,8 @@ public class NameReferencingFileConverter { @@ -45,7 +45,7 @@ index 1422503e1..d3c2e1bed 100644 } else { String[] astring1 = astring; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cf0733baf..1c25dc8f3 100644 +index cf0733baf7..1c25dc8f36 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1399,7 +1399,8 @@ public final class CraftServer implements Server { @@ -59,5 +59,5 @@ index cf0733baf..1c25dc8f3 100644 profile = console.getUserCache().getProfile( name ); } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch b/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch index 26c2cea90..148c70cd1 100644 --- a/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch +++ b/Spigot-Server-Patches/0113-Optimise-BlockState-s-hashCode-equals.patch @@ -1,4 +1,4 @@ -From 2c83bedf7d66dfe55c5b1bd757874c2f4de5f120 Mon Sep 17 00:00:00 2001 +From 2bdd76a1c17eddcc04f21002f53c0941833fe1ec Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 19 Aug 2016 01:52:56 +0100 Subject: [PATCH] Optimise BlockState's hashCode/equals @@ -9,7 +9,7 @@ object identity checks safely. Use a simpler optimized hashcode diff --git a/src/main/java/net/minecraft/server/BlockState.java b/src/main/java/net/minecraft/server/BlockState.java -index 0ce77d923..00e67b567 100644 +index 0ce77d9230..00e67b567f 100644 --- a/src/main/java/net/minecraft/server/BlockState.java +++ b/src/main/java/net/minecraft/server/BlockState.java @@ -28,23 +28,13 @@ public abstract class BlockState> implements IBlockState @@ -41,7 +41,7 @@ index 0ce77d923..00e67b567 100644 public int c() { diff --git a/src/main/java/net/minecraft/server/BlockStateBoolean.java b/src/main/java/net/minecraft/server/BlockStateBoolean.java -index d8738447d..7ca302b52 100644 +index d8738447d7..7ca302b522 100644 --- a/src/main/java/net/minecraft/server/BlockStateBoolean.java +++ b/src/main/java/net/minecraft/server/BlockStateBoolean.java @@ -30,8 +30,7 @@ public class BlockStateBoolean extends BlockState { @@ -55,7 +55,7 @@ index d8738447d..7ca302b52 100644 return true; } else if (object instanceof BlockStateBoolean && super.equals(object)) { diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java -index 1486d460c..7cdadc6b6 100644 +index 1486d460c8..7cdadc6b6a 100644 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java @@ -49,8 +49,7 @@ public class BlockStateEnum & INamable> extends BlockState @@ -69,7 +69,7 @@ index 1486d460c..7cdadc6b6 100644 return true; } else if (object instanceof BlockStateEnum && super.equals(object)) { diff --git a/src/main/java/net/minecraft/server/BlockStateInteger.java b/src/main/java/net/minecraft/server/BlockStateInteger.java -index 6f35c365f..0499a7170 100644 +index 6f35c365f9..0499a71705 100644 --- a/src/main/java/net/minecraft/server/BlockStateInteger.java +++ b/src/main/java/net/minecraft/server/BlockStateInteger.java @@ -38,8 +38,7 @@ public class BlockStateInteger extends BlockState { @@ -83,5 +83,5 @@ index 6f35c365f..0499a7170 100644 return true; } else if (object instanceof BlockStateInteger && super.equals(object)) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch index 673059aab..e20bbc5c8 100644 --- a/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch +++ b/Spigot-Server-Patches/0114-Configurable-packet-in-spam-threshold.patch @@ -1,11 +1,11 @@ -From 7d11d4b8e961bcb5790099363cc49ff58708e277 Mon Sep 17 00:00:00 2001 +From 43dfe118b9c76025227c5e16d5fba88210cbed84 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 11 Sep 2016 14:30:57 -0500 Subject: [PATCH] Configurable packet in spam threshold diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 53f96a157..010b17d2e 100644 +index 53f96a1576..010b17d2e7 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -243,4 +243,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index 53f96a157..010b17d2e 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 7476f07aa..f057ebda8 100644 +index 7476f07aa1..f057ebda81 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1204,13 +1204,14 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -44,5 +44,5 @@ index 7476f07aa..f057ebda8 100644 limitedPackets = 0; return true; -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch index 8a71f9b0e..151022797 100644 --- a/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch +++ b/Spigot-Server-Patches/0115-Configurable-flying-kick-messages.patch @@ -1,11 +1,11 @@ -From adc6e9c72662e89c3fc6e09f8bb277dd0c3aea3f Mon Sep 17 00:00:00 2001 +From 7921cd0efdadd166ff62add3473a7f0778f4c5db Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 20 Sep 2016 00:58:01 +0000 Subject: [PATCH] Configurable flying kick messages diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 010b17d2e..5a83fc21c 100644 +index 010b17d2e7..5a83fc21cb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -252,4 +252,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index 010b17d2e..5a83fc21c 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 77cfec712..16b70221e 100644 +index f057ebda81..5b304c04bc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -147,7 +147,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -43,5 +43,5 @@ index 77cfec712..16b70221e 100644 } } else { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch b/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch index 127847bdf..5944f8d1d 100644 --- a/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch +++ b/Spigot-Server-Patches/0116-Chunk-registration-fixes.patch @@ -1,4 +1,4 @@ -From 0e5fdda0a14744d8d2b6bab930db5ac11d159d31 Mon Sep 17 00:00:00 2001 +From 72fe11d692b51e46025bd53e005221fe322a22ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 22:54:28 -0400 Subject: [PATCH] Chunk registration fixes @@ -21,5 +21,5 @@ index 3004270455..eb99f3a967 100644 if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) { -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch b/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch index babf1dbbe..202835c4b 100644 --- a/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch +++ b/Spigot-Server-Patches/0117-Remove-FishingHook-reference-on-Craft-Entity-removal.patch @@ -1,11 +1,11 @@ -From 5938c13768591563917195f140c984e324ef8fd2 Mon Sep 17 00:00:00 2001 +From 4684fa6318e2f4abedd442c40cb86c2704417b73 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 16 Jun 2016 00:17:23 -0400 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java -index cd04a2b99..174b9f543 100644 +index cd04a2b997..174b9f5431 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFishHook.java @@ -66,4 +66,15 @@ public class CraftFishHook extends AbstractProjectile implements FishHook { @@ -25,5 +25,5 @@ index cd04a2b99..174b9f543 100644 + } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch b/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch index ce7d9fc54..4a3f4ca1e 100644 --- a/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch +++ b/Spigot-Server-Patches/0118-Auto-fix-bad-Y-levels-on-player-login.patch @@ -1,4 +1,4 @@ -From 7f770d5475c7bf8ae56d1eb2f24e4cdc88a27a46 Mon Sep 17 00:00:00 2001 +From 7cffcdf6e990c602452b5ae2c1f56914aa16600d Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Sep 2016 23:48:39 -0400 Subject: [PATCH] Auto fix bad Y levels on player login @@ -18,5 +18,5 @@ index ae1f0d5783..a5701623bf 100644 if (this.getMinecraftServer().getForceGamemode()) { this.playerInteractManager.setGameMode(this.getMinecraftServer().getGamemode()); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch b/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch index f94419607..416576a4d 100644 --- a/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch +++ b/Spigot-Server-Patches/0119-Option-to-remove-corrupt-tile-entities.patch @@ -1,11 +1,11 @@ -From b04aea34b60cbf074e239be94e0167d9766b9d22 Mon Sep 17 00:00:00 2001 +From 56acf52ea2182eae565f88b637844dd0f12f5d17 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 5 Oct 2016 16:27:36 -0500 Subject: [PATCH] Option to remove corrupt tile entities diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 8cf3076f4..721eceeff 100644 +index 8cf3076f4e..721eceeffc 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -298,4 +298,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 8cf3076f4..721eceeff 100644 + } } diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 4fe36bb71..3af311c6e 100644 +index 4fe36bb71d..3af311c6eb 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -534,6 +534,12 @@ public class Chunk implements IChunkAccess { @@ -36,5 +36,5 @@ index 4fe36bb71..3af311c6e 100644 // CraftBukkit end } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch index 0a8c10b33..d29a6645b 100644 --- a/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0120-Add-EntityZapEvent.patch @@ -1,11 +1,11 @@ -From 973596b4d92e7ffb1448f36388f85098cacf0f4a Mon Sep 17 00:00:00 2001 +From e69214e04ad26a535b149ce7611763cca83ad7a6 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java -index 5c24e22c7..8d277566e 100644 +index 5c24e22c7d..8d277566e9 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -164,6 +164,12 @@ public class EntityPig extends EntityAnimal { @@ -22,7 +22,7 @@ index 5c24e22c7..8d277566e 100644 if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index f72347050..5e3835851 100644 +index f723470503..5e3835851d 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -681,6 +681,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -39,7 +39,7 @@ index f72347050..5e3835851 100644 entitywitch.prepare(this.world, this.world.getDamageScaler(new BlockPosition(entitywitch)), EnumMobSpawn.CONVERSION, (GroupDataEntity) null, (NBTTagCompound) null); entitywitch.setNoAI(this.isNoAI()); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 72b8677f2..2d454a3c3 100644 +index 72b8677f26..2d454a3c3e 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1045,6 +1045,14 @@ public class CraftEventFactory { @@ -58,5 +58,5 @@ index 72b8677f2..2d454a3c3 100644 HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch index 29805f719..7db42e305 100644 --- a/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch +++ b/Spigot-Server-Patches/0121-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch @@ -1,11 +1,11 @@ -From ce23eb4d272747cad99b07acc601c47f64b4479d Mon Sep 17 00:00:00 2001 +From 0c71c68c3c5dfa4c5d521196eff2be2940eba0aa Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 12 Nov 2016 23:25:22 -0600 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 721eceeff..bff2e9d26 100644 +index 721eceeffc..bff2e9d26d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -2,6 +2,7 @@ package com.destroystokyo.paper; @@ -30,7 +30,7 @@ index 721eceeff..bff2e9d26 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java -index 40fd012ae..798942a2b 100644 +index 40fd012ae2..798942a2b4 100644 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java @@ -232,6 +232,15 @@ public class EntityFallingBlock extends Entity { @@ -50,5 +50,5 @@ index 40fd012ae..798942a2b 100644 if (nbttagcompound.hasKeyOfType("HurtEntities", 99)) { this.hurtEntities = nbttagcompound.getBoolean("HurtEntities"); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch index 0087b8a54..918ada052 100644 --- a/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/0122-Cache-user-authenticator-threads.patch @@ -1,4 +1,4 @@ -From b1dc43a6bec6886fc0525ee34cd394fbd1a38d74 Mon Sep 17 00:00:00 2001 +From b704867d1819955074cbb3ccc90c76c0d276f426 Mon Sep 17 00:00:00 2001 From: vemacs Date: Wed, 23 Nov 2016 08:31:45 -0500 Subject: [PATCH] Cache user authenticator threads @@ -67,5 +67,5 @@ index a5701623bf..d3bdec7995 100644 this.cr = entityplayer.cr; this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft()); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0123-Optimise-removeQueue.patch b/Spigot-Server-Patches/0123-Optimise-removeQueue.patch index 9a4482f81..05c61fe51 100644 --- a/Spigot-Server-Patches/0123-Optimise-removeQueue.patch +++ b/Spigot-Server-Patches/0123-Optimise-removeQueue.patch @@ -1,11 +1,11 @@ -From 95def3e63a98c3034e5e5eee21c13deb21c7775c Mon Sep 17 00:00:00 2001 +From fd472dc103b6e36824b557a86822a4d3b6f17f55 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Fri, 25 Nov 2016 13:22:40 +0000 Subject: [PATCH] Optimise removeQueue diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c6fd50daa..19e72da6d 100644 +index c6fd50daa8..19e72da6d9 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -97,6 +97,12 @@ public class LoginListener implements PacketLoginInListener { @@ -66,5 +66,5 @@ index c6fd50daa..19e72da6d 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch b/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch index 67990bf15..d6582ecf4 100644 --- a/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch +++ b/Spigot-Server-Patches/0124-Allow-Reloading-of-Command-Aliases.patch @@ -1,4 +1,4 @@ -From eb451b071a9d38520822078a59afba37a9c6146c Mon Sep 17 00:00:00 2001 +From bd1aebbf6f16c7633c376529f45e91d5f4aaf9e0 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Mon, 28 Nov 2016 10:21:52 -0500 Subject: [PATCH] Allow Reloading of Command Aliases @@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases Reload the aliases stored in commands.yml diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 1c25dc8f3..8f7b7e67f 100644 +index 1c25dc8f36..8f7b7e67f3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2118,5 +2118,24 @@ public final class CraftServer implements Server { @@ -35,5 +35,5 @@ index 1c25dc8f3..8f7b7e67f 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch b/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch index 7cd1a3106..15bb79da0 100644 --- a/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch +++ b/Spigot-Server-Patches/0125-Add-source-to-PlayerExpChangeEvent.patch @@ -1,11 +1,11 @@ -From 520d201ae95118a130e5bf74a3fefe6e757a9524 Mon Sep 17 00:00:00 2001 +From ba66292e0b855e1b32ab15c7189aeaa5b5398560 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Thu, 8 Sep 2016 08:48:33 -0700 Subject: [PATCH] Add source to PlayerExpChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index f72bb0c13..0447800d9 100644 +index f72bb0c138..0447800d9d 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -193,7 +193,7 @@ public class EntityExperienceOrb extends Entity { @@ -18,7 +18,7 @@ index f72bb0c13..0447800d9 100644 this.die(); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 2d454a3c3..95973558e 100644 +index 2d454a3c3e..95973558e3 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -111,6 +111,7 @@ import org.bukkit.entity.ThrownPotion; @@ -48,5 +48,5 @@ index 2d454a3c3..95973558e 100644 return handleBlockGrowEvent(world, pos, block, 3); } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch b/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch index 8966f167f..74ef660de 100644 --- a/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch +++ b/Spigot-Server-Patches/0126-Don-t-let-fishinghooks-use-portals.patch @@ -1,11 +1,11 @@ -From a5768da83c6aba10ce497130a14e158cfcbccd57 Mon Sep 17 00:00:00 2001 +From d72d69736365f04a5b40642fc3262d44e449b37e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 16 Dec 2016 16:03:19 -0600 Subject: [PATCH] Don't let fishinghooks use portals diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 3dff47bc3..aad703d68 100644 +index 7e552f985a..2ab877c87b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -161,7 +161,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 3dff47bc3..aad703d68 100644 public DimensionManager dimension; protected BlockPosition ai; diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java -index b10de807e..7a8b8b0d6 100644 +index 40bdcf4e75..39e3bd3795 100644 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java @@ -160,6 +160,12 @@ public class EntityFishingHook extends Entity { @@ -35,5 +35,5 @@ index b10de807e..7a8b8b0d6 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch b/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch index ad4660298..113931842 100644 --- a/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch +++ b/Spigot-Server-Patches/0127-Add-ProjectileCollideEvent.patch @@ -1,4 +1,4 @@ -From 448ac613a2925088451c81269df877b33053955c Mon Sep 17 00:00:00 2001 +From cd5636eda85b76cacc81b1ccabafd6386896ff61 Mon Sep 17 00:00:00 2001 From: Techcable Date: Fri, 16 Dec 2016 21:25:39 -0600 Subject: [PATCH] Add ProjectileCollideEvent @@ -114,5 +114,5 @@ index 95973558e3..c45b7c15fc 100644 Projectile bukkitEntity = (Projectile) entity.getBukkitEntity(); ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch b/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch index 9ae7a5d35..ef67794c5 100644 --- a/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch +++ b/Spigot-Server-Patches/0128-Prevent-Pathfinding-out-of-World-Border.patch @@ -1,4 +1,4 @@ -From 9a9c2c4e2b97c584ca1156e5798f405279213420 Mon Sep 17 00:00:00 2001 +From fcc715150803fa51d3b3fafa3d595d171e29d2b2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Dec 2016 23:07:42 -0500 Subject: [PATCH] Prevent Pathfinding out of World Border @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border This prevents Entities from trying to run outside of the World Border diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index 39a0c45bb..bdd092e49 100644 +index 39a0c45bb0..bdd092e49d 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -123,7 +123,7 @@ public abstract class NavigationAbstract { @@ -19,5 +19,5 @@ index 39a0c45bb..bdd092e49 100644 if (!copiedSet) { copiedSet = true; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch index 39dfb4027..f411f6c25 100644 --- a/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch +++ b/Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch @@ -1,4 +1,4 @@ -From dc7eab832d8090ec3ed5654c5f66e7713f6693ba Mon Sep 17 00:00:00 2001 +From dbef5e27ac9329eea9eac13f8262809bc66236a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Dec 2016 00:11:43 -0500 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z Reduce method invocations for World.isLoaded(BlockPosition)Z diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 05ee02c4c..ff14c265b 100644 +index 05ee02c4c2..ff14c265b1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -224,6 +224,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -22,5 +22,5 @@ index 05ee02c4c..ff14c265b 100644 return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch b/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch index 9d80bf8dd..9b13019dd 100644 --- a/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch +++ b/Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch @@ -1,4 +1,4 @@ -From f210484a8d88355c4669f3100af808e178633995 Mon Sep 17 00:00:00 2001 +From afee5d8e6bb2a78515a3da8d7288e819da577af9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:15:11 -0500 Subject: [PATCH] Bound Treasure Maps to World Border @@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable one is in border that would of been missed. diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index 0f248b6de..e8ce2ecf2 100644 +index 0f248b6de3..e8ce2ecf23 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -108,6 +108,7 @@ public abstract class StructureGenerator @@ -23,7 +23,7 @@ index 0f248b6de..e8ce2ecf2 100644 if (structurestart != null && structurestart.e()) { diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java -index 4ee13ac45..5f10c4338 100644 +index 4ee13ac454..5f10c4338e 100644 --- a/src/main/java/net/minecraft/server/WorldBorder.java +++ b/src/main/java/net/minecraft/server/WorldBorder.java @@ -24,6 +24,18 @@ public class WorldBorder { @@ -46,5 +46,5 @@ index 4ee13ac45..5f10c4338 100644 return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f(); } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch index 0c68c02f4..360bd692f 100644 --- a/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From b24644a151756ba4b737e8131605ae8f3b83b58e Mon Sep 17 00:00:00 2001 +From 5530a9b263ae79a80b9a46fe22034007ec906132 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's which are limited in quantity. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bff2e9d26..f164844f3 100644 +index bff2e9d26d..f164844f33 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -312,4 +312,14 @@ public class PaperWorldConfig { @@ -28,7 +28,7 @@ index bff2e9d26..f164844f3 100644 + } } diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java -index 3bcf0b385..4764ffef7 100644 +index 3bcf0b385d..4764ffef77 100644 --- a/src/main/java/net/minecraft/server/VillagerTrades.java +++ b/src/main/java/net/minecraft/server/VillagerTrades.java @@ -92,7 +92,8 @@ public class VillagerTrades { @@ -42,5 +42,5 @@ index 3bcf0b385..4764ffef7 100644 if (blockposition != null) { ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch b/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch index 0537cb532..db1054de3 100644 --- a/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch +++ b/Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch @@ -1,4 +1,4 @@ -From c731a821d8577959c6ff754dc9bbe1223dad3676 Mon Sep 17 00:00:00 2001 +From 67a0f28671a63dd0541a0cbc89a93c374c445ffd Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Dec 2016 03:48:29 -0500 Subject: [PATCH] Optimize ItemStack.isEmpty() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty() Remove hashMap lookup every check, simplify code to remove ternary diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 213e3779d..2f08979f0 100644 +index db11c8ec69..854cffe6c9 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -150,7 +150,7 @@ public final class ItemStack { @@ -19,5 +19,5 @@ index 213e3779d..2f08979f0 100644 public ItemStack cloneAndSubtract(int i) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch b/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch index 6345751c8..bac04aeed 100644 --- a/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch +++ b/Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch @@ -1,11 +1,11 @@ -From d23e6a02d99b8f7f436d4a92fda213290ae94492 Mon Sep 17 00:00:00 2001 +From 085f39ca706bdfb003624eb6c180cf934a8a9405 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 21 Dec 2016 11:47:25 -0600 Subject: [PATCH] Add API methods to control if armour stands can move diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index ed6092f65..176af6c88 100644 +index ed6092f65a..176af6c889 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving { @@ -31,7 +31,7 @@ index ed6092f65..176af6c88 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 2b66a08ad..124c3185b 100644 +index 2b66a08ade..124c3185bc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { @@ -52,5 +52,5 @@ index 2b66a08ad..124c3185b 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch b/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch index 67aef597f..4f49976a6 100644 --- a/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch +++ b/Spigot-Server-Patches/0134-Properly-fix-item-duplication-bug.patch @@ -1,4 +1,4 @@ -From 414cee6eee5fd0b0c91db8027459118baca2fb65 Mon Sep 17 00:00:00 2001 +From c14beb24f2fd5ecb413ecde5e4df9b8947e3ec45 Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Tue, 27 Dec 2016 01:57:57 +0000 Subject: [PATCH] Properly fix item duplication bug @@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug Credit to prplz for figuring out the real issue diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index d3bdec799..1296eb04f 100644 +index d3bdec7995..1296eb04f0 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1800,7 +1800,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -19,7 +19,7 @@ index d3bdec799..1296eb04f 100644 @Override diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 5b304c04b..f367a76e8 100644 +index 5b304c04bc..f367a76e82 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2526,7 +2526,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -32,5 +32,5 @@ index 5b304c04b..f367a76e8 100644 // CraftBukkit end -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch b/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch index 7580be202..97a913bba 100644 --- a/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch +++ b/Spigot-Server-Patches/0135-String-based-Action-Bar-API.patch @@ -1,4 +1,4 @@ -From 87036dca71606ff58cac12d21de6c58606923392 Mon Sep 17 00:00:00 2001 +From bf29f85184a1f798675d861e1d01fec7fa424428 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Dec 2016 15:02:42 -0500 Subject: [PATCH] String based Action Bar API diff --git a/Spigot-Server-Patches/0136-Firework-API-s.patch b/Spigot-Server-Patches/0136-Firework-API-s.patch index 723eba132..bfa8c5043 100644 --- a/Spigot-Server-Patches/0136-Firework-API-s.patch +++ b/Spigot-Server-Patches/0136-Firework-API-s.patch @@ -1,11 +1,11 @@ -From 51e28b99908d298f072a70e0a2fe902553a11cc3 Mon Sep 17 00:00:00 2001 +From 2343191bdb15c6a3287804f78858c35fd631aef5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 28 Dec 2016 07:18:33 +0100 Subject: [PATCH] Firework API's diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 4f51b9b65..278ef79d8 100644 +index 4f51b9b654..278ef79d89 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -3,6 +3,8 @@ package net.minecraft.server; @@ -53,7 +53,7 @@ index 4f51b9b65..278ef79d8 100644 @Override diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 313076d6d..7be41c869 100644 +index 313076d6d8..7be41c8698 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { @@ -65,7 +65,7 @@ index 313076d6d..7be41c869 100644 object = a(world, entityliving, itemstack, itemstack1); if (flag || f3 != 0.0F) { diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 058c016b7..92dac35ec 100644 +index 058c016b7b..92dac35ec4 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -18,6 +18,7 @@ public class ItemFireworks extends Item { @@ -90,7 +90,7 @@ index 058c016b7..92dac35ec 100644 itemstack.subtract(1); } diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java -index 75604dbc6..98deaba12 100644 +index 75604dbc69..98deaba12c 100644 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java @@ -136,7 +136,7 @@ public class NBTTagCompound implements NBTBase { @@ -103,7 +103,7 @@ index 75604dbc6..98deaba12 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 475b7b004..de74e7214 100644 +index 475b7b004b..de74e7214a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity; @@ -145,5 +145,5 @@ index 475b7b004..de74e7214 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch index cf4180b0a..c0287d486 100644 --- a/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch @@ -1,4 +1,4 @@ -From f0bf33be3ce52334e0e22af9af7213f0648a1994 Mon Sep 17 00:00:00 2001 +From 67e81833b91a07330074fc7e72c905b67b59f91d Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 31 Dec 2016 21:44:50 -0500 Subject: [PATCH] PlayerTeleportEndGatewayEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent Allows you to access the Gateway being used in a teleport event diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index b907a3c4d..78fba7937 100644 +index b907a3c4d8..78fba79378 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -133,7 +133,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -19,5 +19,5 @@ index b907a3c4d..78fba7937 100644 if (teleEvent.isCancelled()) { return; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch b/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch index 6466630fd..a5a1e35d5 100644 --- a/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch +++ b/Spigot-Server-Patches/0138-Provide-E-TE-Chunk-count-stat-methods.patch @@ -1,4 +1,4 @@ -From 171ede11261f5166ac6ba2d8323b8125c638eb45 Mon Sep 17 00:00:00 2001 +From bcfbc728fd05e1d34c7db822258ca12d4875aafb Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:24:46 -0500 Subject: [PATCH] Provide E/TE/Chunk count stat methods @@ -60,5 +60,5 @@ index 16b78bd02e..c06b10c6b1 100644 public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) { -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch index ea9dd9394..39a075c93 100644 --- a/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From 6f2ec40f9f93d4c3d31a85d5fa3af7221c1f0e5f Mon Sep 17 00:00:00 2001 +From e211184dc4675d9e49aad3a32e0b2a832ec50040 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index b7012b5b6..ce5bd2229 100644 +index b7012b5b64..ce5bd2229e 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -931,11 +931,13 @@ public abstract class PlayerList { @@ -25,5 +25,5 @@ index b7012b5b6..ce5bd2229 100644 public WhiteList getWhitelist() { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch b/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch index 56e54fa3a..81c4bd733 100644 --- a/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch +++ b/Spigot-Server-Patches/0140-Don-t-allow-entities-to-ride-themselves-572.patch @@ -1,4 +1,4 @@ -From 7b05afa5b801b6e5a69ac0017d8c829f3e2c27ae Mon Sep 17 00:00:00 2001 +From 573d1cfd449b7e3c354033b3e6846b4c455874ae Mon Sep 17 00:00:00 2001 From: Alfie Cleveland Date: Sun, 8 Jan 2017 04:31:36 +0000 Subject: [PATCH] Don't allow entities to ride themselves - #572 diff --git a/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index c592a2dad..13f17e2d9 100644 --- a/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0141-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 365d0c142448b87a423117a3bdaffcf1f4c53739 Mon Sep 17 00:00:00 2001 +From b8fe1ba7ee5dcbf4f63adefe4d57181b32da4dda Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -301,5 +301,5 @@ index 1b512cc45c..fbad045675 100644 public EntityExperienceOrb getHandle() { return (EntityExperienceOrb) entity; -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch b/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch index e82c7db04..6623736ba 100644 --- a/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch +++ b/Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 48a505cdbeda1a8b88ffd38e6e9a1dfd87dc078b Mon Sep 17 00:00:00 2001 +From c60aec0eb4548625a800d36c5977d5ba6990a891 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 22 Jan 2017 18:07:56 -0500 Subject: [PATCH] Cap Entity Collisions @@ -27,7 +27,7 @@ index f164844f33..751551f173 100644 + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 59cf0d1017..0b08e9b31b 100644 +index 1c8958d15d..4f8e10b860 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -56,5 +56,5 @@ index 2775afc327..74de19bbfb 100644 this.C(entity); } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch b/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch index 10e7bc8e1..5407be47c 100644 --- a/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch +++ b/Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch @@ -1,4 +1,4 @@ -From f2851935c9285c2c9454123b166bcdb733cc50a2 Mon Sep 17 00:00:00 2001 +From 3fdc2eae474660f8156b508c0d68c5988fd2b67e Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 5 Feb 2017 00:04:04 -0500 Subject: [PATCH] Remove CraftScheduler Async Task Debugger @@ -9,7 +9,7 @@ One report of a suspected memory leak with the system. This adds additional overhead to asynchronous task dispatching diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 552daf437..e102be583 100644 +index 552daf4376..e102be583c 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -47,5 +47,5 @@ index 552daf437..e102be583 100644 @Deprecated -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch b/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch index 60e424dd6..128a438a9 100644 --- a/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch +++ b/Spigot-Server-Patches/0144-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch @@ -1,11 +1,11 @@ -From 306788514e502ec1f8ac21c5f937bbd4b0e1a2cc Mon Sep 17 00:00:00 2001 +From 58d7d22e391562ed715f337910c5dfb6640403a9 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 7 Feb 2017 16:55:35 -0600 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index c575ff57dd..86e1b403b2 100644 +index 291c2a17bb..936fc4f6b9 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -139,7 +139,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -37,5 +37,5 @@ index c575ff57dd..86e1b403b2 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch b/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch index 5b9e7813e..27de86157 100644 --- a/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch +++ b/Spigot-Server-Patches/0145-Do-not-let-armorstands-drown.patch @@ -1,11 +1,11 @@ -From 70589bdf9b826b5b1ee18076b19b8644525f86ac Mon Sep 17 00:00:00 2001 +From 15e6df8dfd3a4f2a37cb02e5ca6ad4e533438184 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 18 Feb 2017 19:29:58 -0600 Subject: [PATCH] Do not let armorstands drown diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 176af6c88..992d7bfb0 100644 +index 176af6c889..992d7bfb0f 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -826,5 +826,10 @@ public class EntityArmorStand extends EntityLiving { @@ -20,7 +20,7 @@ index 176af6c88..992d7bfb0 100644 // Paper end } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 74de19bbf..b31355f2b 100644 +index 74de19bbfb..b31355f2be 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity { @@ -41,5 +41,5 @@ index 74de19bbf..b31355f2b 100644 if (this.getAirTicks() == -20) { this.setAirTicks(0); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch index 7d158d12b..7569ab8b4 100644 --- a/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0146-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From c946999fea61c4fdb1cc1cff2d13dc57c2f28ebc Mon Sep 17 00:00:00 2001 +From b6ef70a89bd5c1d6f2d7178583bd3a9e70855fb6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index bdc98d12c..e41352681 100644 +index bdc98d12c6..e41352681a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -88,6 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 13 May 2017 20:11:21 -0500 Subject: [PATCH] Add system property to disable book size limits @@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without limiting incoming data from packets in some other way. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java -index 08f3a315f..6ddb13358 100644 +index 08f3a315f3..6ddb133587 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java @@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta { @@ -57,5 +57,5 @@ index 08f3a315f..6ddb13358 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch b/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch index 3685b8198..e240c4fbc 100644 --- a/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch +++ b/Spigot-Server-Patches/0148-Add-option-to-make-parrots-stay-on-shoulders-despite.patch @@ -1,4 +1,4 @@ -From 02c2cd67ab3608d5d46fdd7168b306f80a48f4da Mon Sep 17 00:00:00 2001 +From a1610cec97de35b2e2a368aea3eaf1cf1faea507 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 16 May 2017 21:29:08 -0500 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement @@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release. To be converted into a Paper-API event at some point in the future? diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 751551f17..eae1690cc 100644 +index 751551f173..eae1690cc6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -328,4 +328,10 @@ public class PaperWorldConfig { @@ -26,7 +26,7 @@ index 751551f17..eae1690cc 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index b407d80ae..5e92f0ddb 100644 +index b407d80ae6..5e92f0ddb4 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -39,7 +39,7 @@ index b407d80ae..5e92f0ddb 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f367a76e8..046ef418f 100644 +index f367a76e82..046ef418f8 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1773,6 +1773,13 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -57,5 +57,5 @@ index f367a76e8..046ef418f 100644 case RELEASE_SHIFT_KEY: this.player.setSneaking(false); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch b/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch index 27a33f5e1..98ea9110a 100644 --- a/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch +++ b/Spigot-Server-Patches/0149-Add-configuration-option-to-prevent-player-names-fro.patch @@ -1,4 +1,4 @@ -From 72467495d3d17355d11889a3c33049bdf745610e Mon Sep 17 00:00:00 2001 +From c86f500887327ec327c692597b05d2ad6f14b530 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 9 Jun 2017 07:24:34 -0700 Subject: [PATCH] Add configuration option to prevent player names from being @@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5a83fc21c..295b8390c 100644 +index 5a83fc21cb..295b8390cb 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -259,4 +259,9 @@ public class PaperConfig { @@ -20,7 +20,7 @@ index 5a83fc21c..295b8390c 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8f7b7e67f..2e0f443d9 100644 +index 8f7b7e67f3..2e0f443d9f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2137,5 +2137,10 @@ public final class CraftServer implements Server { @@ -35,5 +35,5 @@ index 8f7b7e67f..2e0f443d9 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch b/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch index 67eca632e..2ce7572f4 100644 --- a/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/Spigot-Server-Patches/0150-Use-TerminalConsoleAppender-for-console-improvements.patch @@ -1,4 +1,4 @@ -From 315a86ae9cbec64a1333240cb6277631d7547600 Mon Sep 17 00:00:00 2001 +From ae37423189520689ed1fa08b3faa834e6940a363 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -19,7 +19,7 @@ Other changes: configuration diff --git a/pom.xml b/pom.xml -index 3dc6c2a3f..b1f008738 100644 +index 3dc6c2a3f5..b1f008738b 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,27 @@ @@ -75,7 +75,7 @@ index 3dc6c2a3f..b1f008738 100644 org.apache.maven.plugins diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java new file mode 100644 -index 000000000..cd6e25923 +index 0000000000..cd6e259239 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -0,0 +1,40 @@ @@ -121,7 +121,7 @@ index 000000000..cd6e25923 +} diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java new file mode 100644 -index 000000000..685deaa0e +index 0000000000..685deaa0e5 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java @@ -0,0 +1,17 @@ @@ -143,7 +143,7 @@ index 000000000..685deaa0e + +} diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index 4b1f8c537..d34f772fa 100644 +index 4b1f8c5373..d34f772fae 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -86,6 +86,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer @@ -185,7 +185,7 @@ index 4b1f8c537..d34f772fa 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e41352681..7016dac2d 100644 +index e41352681a..7016dac2d7 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -57,7 +57,7 @@ import org.apache.commons.lang3.Validate; @@ -244,7 +244,7 @@ index e41352681..7016dac2d 100644 public KeyPair getKeyPair() { diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 1eb53f67e..308bc3baf 100644 +index 1eb53f67ef..308bc3baf2 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -76,8 +76,7 @@ public abstract class PlayerList { @@ -258,7 +258,7 @@ index 1eb53f67e..308bc3baf 100644 this.k = new GameProfileBanList(PlayerList.b); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 2e0f443d9..742c21480 100644 +index 2e0f443d9f..742c21480a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -42,7 +42,6 @@ import java.util.logging.Level; @@ -284,7 +284,7 @@ index 2e0f443d9..742c21480 100644 @Override public PluginCommand getPluginCommand(String name) { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 93fcfd5f3..0e76e3466 100644 +index 93fcfd5f39..0e76e34664 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -13,7 +13,7 @@ import java.util.logging.Logger; @@ -335,7 +335,7 @@ index 93fcfd5f3..0e76e3466 100644 } catch (Throwable t) { diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java deleted file mode 100644 -index fdf2f075e..000000000 +index fdf2f075e2..0000000000 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java +++ /dev/null @@ -1,72 +0,0 @@ @@ -412,7 +412,7 @@ index fdf2f075e..000000000 - } -} diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index befcc19f9..5510266fb 100644 +index befcc19f9b..5510266fb1 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -4,20 +4,31 @@ import java.util.Collections; @@ -495,7 +495,7 @@ index befcc19f9..5510266fb 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index 70f8d4299..449e99d1b 100644 +index 70f8d42992..449e99d1b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread { @@ -509,7 +509,7 @@ index 70f8d4299..449e99d1b 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java deleted file mode 100644 -index 99564fed7..000000000 +index 99564fed7c..0000000000 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java +++ /dev/null @@ -1,58 +0,0 @@ @@ -573,13 +573,13 @@ index 99564fed7..000000000 -} diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties new file mode 100644 -index 000000000..0694b2146 +index 0000000000..0694b21465 --- /dev/null +++ b/src/main/resources/log4j2.component.properties @@ -0,0 +1 @@ +log4j.skipJansi=true diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 722ca8496..620b9490e 100644 +index 722ca84968..620b9490e5 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -1,17 +1,14 @@ @@ -617,5 +617,5 @@ index 722ca8496..620b9490e 100644 -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch b/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch index 376b792ce..9a3f2c5bc 100644 --- a/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch +++ b/Spigot-Server-Patches/0151-provide-a-configurable-option-to-disable-creeper-lin.patch @@ -1,4 +1,4 @@ -From ba211b765d1d39b30afea49c4f755efc576a28c4 Mon Sep 17 00:00:00 2001 +From 3e65aca5cf6438722db5073154a9bffe5c4b16a9 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Jun 2017 21:01:18 +0100 Subject: [PATCH] provide a configurable option to disable creeper lingering @@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index eae1690cc..39ab54575 100644 +index eae1690cc6..39ab545756 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -334,4 +334,10 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index eae1690cc..39ab54575 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index cc9887d04..374cf28fb 100644 +index cc9887d040..374cf28fb4 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster { @@ -34,5 +34,5 @@ index cc9887d04..374cf28fb 100644 entityareaeffectcloud.setSource(this); // CraftBukkit -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0152-Item-canEntityPickup.patch b/Spigot-Server-Patches/0152-Item-canEntityPickup.patch index fe428e9ea..94fa4ef7e 100644 --- a/Spigot-Server-Patches/0152-Item-canEntityPickup.patch +++ b/Spigot-Server-Patches/0152-Item-canEntityPickup.patch @@ -1,4 +1,4 @@ -From dc28ce75c8988094bb77818413f2eadce20f0c96 Mon Sep 17 00:00:00 2001 +From 2df124c430e0d7f180c0018523390ce0ab4bf5a5 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 5 May 2017 03:57:17 -0500 Subject: [PATCH] Item#canEntityPickup @@ -54,5 +54,5 @@ index cc593fbc99..3f552b5905 100644 public String toString() { return "CraftItem"; -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch b/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch index 2370572cd..a0cff62e3 100644 --- a/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch +++ b/Spigot-Server-Patches/0153-PlayerPickupItemEvent-setFlyAtPlayer.patch @@ -1,11 +1,11 @@ -From 5adb935325d11e6eec89a40d2b60af88e2c69eff Mon Sep 17 00:00:00 2001 +From 9fde0dfeb5e1a49aba85ebc02f83010db78eb6cc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 May 2017 06:26:09 -0500 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 9973fc0b1..4b2e19f30 100644 +index 97c6a8b6bd..8747dc7075 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -322,6 +322,7 @@ public class EntityItem extends Entity { @@ -45,5 +45,5 @@ index 9973fc0b1..4b2e19f30 100644 this.die(); itemstack.setCount(i); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch b/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch index b62776353..290d15d94 100644 --- a/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch +++ b/Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch @@ -1,11 +1,11 @@ -From bf2d3ddb6441d9937087cb21338d2129bf2275e3 Mon Sep 17 00:00:00 2001 +From b8f60aabc6115c141b7cbf45eb4462d31ea3fbdc Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 11 Jun 2017 16:30:30 -0500 Subject: [PATCH] PlayerAttemptPickupItemEvent diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 4b2e19f30..fcc1c0993 100644 +index 8747dc7075..5efcc50ab9 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -9,6 +9,7 @@ import javax.annotation.Nullable; @@ -40,5 +40,5 @@ index 4b2e19f30..fcc1c0993 100644 itemstack.setCount(canHold); // Call legacy event -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch index 5c2d7e789..cd0afb5de 100644 --- a/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch +++ b/Spigot-Server-Patches/0155-Add-UnknownCommandEvent.patch @@ -1,11 +1,11 @@ -From ec59488f25be69a5f469dce46fa47018e4355331 Mon Sep 17 00:00:00 2001 +From d8637d8eaf04e7f109b77ef684fa51fc7c06a206 Mon Sep 17 00:00:00 2001 From: Sweepyoface Date: Sat, 17 Jun 2017 18:48:21 -0400 Subject: [PATCH] Add UnknownCommandEvent diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 742c21480..1f1af567b 100644 +index 742c21480a..1f1af567b4 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -79,6 +79,7 @@ import net.minecraft.server.WorldServer; @@ -40,5 +40,5 @@ index 742c21480..1f1af567b 100644 // Spigot end -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch index daec78c1e..cf438bee2 100644 --- a/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch +++ b/Spigot-Server-Patches/0156-Basic-PlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 5de8db67726252bb14d83e1e3a82f5b3351013a5 Mon Sep 17 00:00:00 2001 +From 449977d43ddf6112be1ed70200b24a6006396d48 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API diff --git a/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch index 72fdfe496..6ac7ebc4d 100644 --- a/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch +++ b/Spigot-Server-Patches/0157-Shoulder-Entities-Release-API.patch @@ -1,4 +1,4 @@ -From 208cc8250ed7e383da5a75b28da1ec254dbc6393 Mon Sep 17 00:00:00 2001 +From ffc841cf1a9d42a53445f81cc495107844cc5ba5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 15:18:30 -0400 Subject: [PATCH] Shoulder Entities Release API @@ -95,5 +95,5 @@ index 66cd2db1ea..a1397d1427 100644 public boolean discoverRecipe(NamespacedKey recipe) { return discoverRecipes(Arrays.asList(recipe)) != 0; -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch b/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch index 067df0578..2c7af76df 100644 --- a/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch +++ b/Spigot-Server-Patches/0158-Profile-Lookup-Events.patch @@ -1,4 +1,4 @@ -From d972b9f4d8b1cf7b7f1904760ea4a51d4ce481b9 Mon Sep 17 00:00:00 2001 +From b42b5c27a4119a90ee1cc89c9fb4976323c13bdd Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 17 Jun 2017 17:00:32 -0400 Subject: [PATCH] Profile Lookup Events @@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p profiles that had to be looked up. diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java -index 3bcdb8f93..bb9894318 100644 +index 3bcdb8f93f..bb9894318e 100644 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java @@ -1,17 +1,68 @@ @@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644 } } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch b/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch index c4bca0965..0ce863e27 100644 --- a/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch +++ b/Spigot-Server-Patches/0159-Block-player-logins-during-server-shutdown.patch @@ -1,11 +1,11 @@ -From 6826d03ce0fda52f196d1a15750eafc9cfb59fe3 Mon Sep 17 00:00:00 2001 +From a5bc0e06873b8f934ec73ba308bb2d0d381edf7f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 2 Jul 2017 21:35:56 -0500 Subject: [PATCH] Block player logins during server shutdown diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 19e72da6d..234451ebc 100644 +index 19e72da6d9..234451ebc8 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener { @@ -22,5 +22,5 @@ index 19e72da6d..234451ebc 100644 this.c(); } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch b/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch index b9389ea2b..039d94eaf 100644 --- a/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch +++ b/Spigot-Server-Patches/0160-Entity-fromMobSpawner.patch @@ -1,11 +1,11 @@ -From e9ee7cc846760bee9c3e2e4f8d02c315abd1acff Mon Sep 17 00:00:00 2001 +From 75a0444ae173c51f5eb262f0716845693cd754a6 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 0b08e9b31b..64dc37c70c 100644 +index 4f8e10b860..1de1a10cf0 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -188,6 +188,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -64,5 +64,5 @@ index bb07dec3c8..495a7c464f 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch b/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch index ac272584e..cb0f171af 100644 --- a/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch +++ b/Spigot-Server-Patches/0161-Improve-the-Saddle-API-for-Horses.patch @@ -1,4 +1,4 @@ -From bdf1253f1cb07a518bb9a7e41e1fefb64b022f11 Mon Sep 17 00:00:00 2001 +From 3363396eb2533f24b7e4408fe9cc3fe2c42fadcc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Dec 2016 16:24:06 -0500 Subject: [PATCH] Improve the Saddle API for Horses @@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa and access their saddle state separately from an interface shared with Armor. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 09016e354..9952db3eb 100644 +index 09016e3547..9952db3eb5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract; @@ -27,7 +27,7 @@ index 09016e354..9952db3eb 100644 } } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java -index 63991bf4b..9a47a1adc 100644 +index 63991bf4be..9a47a1adc1 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory; @@ -41,7 +41,7 @@ index 63991bf4b..9a47a1adc 100644 super(inventory); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java new file mode 100644 -index 000000000..99cfbaf90 +index 0000000000..99cfbaf90b --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java @@ -0,0 +1,15 @@ @@ -61,5 +61,5 @@ index 000000000..99cfbaf90 + +} -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch b/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch index b62750506..5ed5d56cf 100644 --- a/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch +++ b/Spigot-Server-Patches/0162-Implement-ensureServerConversions-API.patch @@ -1,4 +1,4 @@ -From e2ec596f328db2922bc58371a5af7e215905d352 Mon Sep 17 00:00:00 2001 +From 28bc2a5976de226d2af3900ba5f40d48df3cc62a Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 22:43:12 -0400 Subject: [PATCH] Implement ensureServerConversions API @@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr to ensure it meets latest minecraft expectations. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 01ab19434..8b219b5fa 100644 +index 01ab19434a..8b219b5fa2 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory { @@ -22,5 +22,5 @@ index 01ab19434..8b219b5fa 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch b/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch index ec5f167c7..162cb2872 100644 --- a/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch +++ b/Spigot-Server-Patches/0163-Implement-getI18NDisplayName.patch @@ -1,4 +1,4 @@ -From e823c6756ac082bef0eb66921145b90225a01fbb Mon Sep 17 00:00:00 2001 +From 14dff3cabf6f1b60cf87426b00671a5211f7f3f9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 May 2016 23:59:38 -0400 Subject: [PATCH] Implement getI18NDisplayName @@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this, You must replace the language file embedded in the server jar. diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java -index c0c13798f..601273933 100644 +index c0c13798f8..6012739331 100644 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java @@ -65,10 +65,12 @@ public class LocaleLanguage { @@ -25,7 +25,7 @@ index c0c13798f..601273933 100644 return this.c(s); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -index 8b219b5fa..23d775645 100644 +index 8b219b5fa2..23d7756456 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java @@ -340,5 +340,18 @@ public final class CraftItemFactory implements ItemFactory { @@ -48,5 +48,5 @@ index 8b219b5fa..23d775645 100644 // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch index 4d243b04b..ef2a2140e 100644 --- a/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch @@ -1,11 +1,11 @@ -From e9bdd9e117f76a4b2a23d8386809df4566de70d5 Mon Sep 17 00:00:00 2001 +From 58c8c7d8a9a9aae224e14fa54c4a63157d06ba4e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:10 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 308bc3baf..002f7e844 100644 +index 308bc3baf2..002f7e844a 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -522,9 +522,9 @@ public abstract class PlayerList { @@ -48,5 +48,5 @@ index 308bc3baf..002f7e844 100644 public boolean isOp(GameProfile gameprofile) { return this.operators.d(gameprofile) || this.server.a(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().t() || this.u; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch index 3971bb893..a2b771c29 100644 --- a/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch @@ -1,4 +1,4 @@ -From 03b9b52d8459a795dcc69eb20c7e7fee18f07448 Mon Sep 17 00:00:00 2001 +From ecf6ec4205b6e9d942dd5890913b264c0ce81aa8 Mon Sep 17 00:00:00 2001 From: DemonWav Date: Sun, 6 Aug 2017 17:17:53 -0500 Subject: [PATCH] Fix this stupid bullshit @@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa and to provide some level of hint without being disruptive. diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index d1636ce21..eb5f44e30 100644 +index 0e76e34664..444a6a608b 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -218,10 +218,12 @@ public class Main { @@ -29,5 +29,5 @@ index d1636ce21..eb5f44e30 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch b/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch index c6f39e21c..a50518375 100644 --- a/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch +++ b/Spigot-Server-Patches/0166-Ocelot-despawns-should-honor-nametags-and-leash.patch @@ -1,11 +1,11 @@ -From b85a89090ea6103014d91a52477423811b2052a3 Mon Sep 17 00:00:00 2001 +From fd673275e5f2f533af7c23ca18c3a13bbf6cadaf Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:54:40 -0500 Subject: [PATCH] Ocelot despawns should honor nametags and leash diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java -index 062411455..d9a7b8ac1 100644 +index 0624114553..d9a7b8ac1e 100644 --- a/src/main/java/net/minecraft/server/EntityOcelot.java +++ b/src/main/java/net/minecraft/server/EntityOcelot.java @@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal { @@ -18,5 +18,5 @@ index 062411455..d9a7b8ac1 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch b/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch index 164225806..4ce4e1c45 100644 --- a/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch +++ b/Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch @@ -1,4 +1,4 @@ -From 59016efe7eff58950e55e8102fc6ee2af6b41461 Mon Sep 17 00:00:00 2001 +From cf2f4b1e5981127d40f7acb4f39b34a05271a8a0 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:45:19 -0500 Subject: [PATCH] Reset spawner timer when spawner event is cancelled @@ -26,5 +26,5 @@ index ab5d83d34d..c38295a09d 100644 } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch b/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch index cd5f18499..3d8f9cf1c 100644 --- a/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch +++ b/Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch @@ -1,11 +1,11 @@ -From a7f54212cb9fc405240c8bd0cb90bcccb0c3ccec Mon Sep 17 00:00:00 2001 +From 9623869646171a8fa71018ddff5408b23c798906 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 9 Aug 2017 17:51:22 -0500 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index ff14c265b..bfb682ebb 100644 +index ff14c265b1..bfb682ebbd 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -645,7 +645,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -22,5 +22,5 @@ index ff14c265b..bfb682ebb 100644 this.tileEntityListUnload.clear(); } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch index 78ea54e0a..a500be84c 100644 --- a/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch @@ -1,4 +1,4 @@ -From 2b45f2bf214d748972f84a3037a766828f4f1c42 Mon Sep 17 00:00:00 2001 +From 8216a8c6dd17b26814884d2e64542a03f3779544 Mon Sep 17 00:00:00 2001 From: kashike Date: Thu, 17 Aug 2017 16:08:20 -0700 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick @@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 295b8390c..5884b04f7 100644 +index 295b8390cb..5884b04f7e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -1,5 +1,6 @@ @@ -27,7 +27,7 @@ index 295b8390c..5884b04f7 100644 + } } diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 234451ebc..758fe7748 100644 +index 234451ebc8..758fe77489 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -247,6 +247,10 @@ public class LoginListener implements PacketLoginInListener { @@ -42,5 +42,5 @@ index 234451ebc..758fe7748 100644 LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable"); } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch b/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch index 73f3922a2..471e4cbc8 100644 --- a/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch +++ b/Spigot-Server-Patches/0170-LivingEntity-setKiller.patch @@ -1,4 +1,4 @@ -From fb53514d89db2dc79214dc552cbe3ca476449886 Mon Sep 17 00:00:00 2001 +From 7240dff14641c3f58898416b67cf426b31cc71d4 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 31 Jul 2017 01:49:48 -0500 Subject: [PATCH] LivingEntity#setKiller @@ -39,5 +39,5 @@ index e38f4f6910..23a4819992 100644 public boolean addPotionEffect(PotionEffect effect) { return addPotionEffect(effect, false); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch b/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch index c3b6e3d6a..82360381b 100644 --- a/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch +++ b/Spigot-Server-Patches/0171-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch @@ -1,4 +1,4 @@ -From 90408a8c1715bee9634ab40f404f1ec16be36062 Mon Sep 17 00:00:00 2001 +From b0bb87241e3ca3a38ee92fdcc0260fabedf9363e Mon Sep 17 00:00:00 2001 From: Minecrell Date: Mon, 18 Sep 2017 12:00:03 +0200 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger @@ -12,7 +12,7 @@ results in a separate line, even though it should not result in a line break. Log4j's implementation handles it correctly. diff --git a/pom.xml b/pom.xml -index 93c1a04bc6..663eacfe27 100644 +index b1f008738b..14c4ec250c 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,11 @@ @@ -45,5 +45,5 @@ index d34f772fae..ec257ba31f 100644 thread.setDaemon(true); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch b/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch index 717e5c6dc..a1d61ed3d 100644 --- a/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch +++ b/Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch @@ -1,4 +1,4 @@ -From c933a958f37c72234adcccd4f1d52e7f97dd3f49 Mon Sep 17 00:00:00 2001 +From 617fb94e256f7eafc1660a273e40c925fbf98d3a Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:14:55 +0200 Subject: [PATCH] Handle plugin prefixes using Log4J configuration @@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing the plugin logger. diff --git a/pom.xml b/pom.xml -index 663eacfe2..7132e2021 100644 +index 14c4ec250c..5a230592c7 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ @@ -28,7 +28,7 @@ index 663eacfe2..7132e2021 100644 org.apache.logging.log4j diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index fdca34346..6d77bbc5a 100644 +index fdca34346a..6d77bbc5aa 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -286,7 +286,7 @@ public class SpigotConfig @@ -41,7 +41,7 @@ index fdca34346..6d77bbc5a 100644 public static int playerShuffle; diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index 620b9490e..a8bdaaeaa 100644 +index 620b9490e5..a8bdaaeaa1 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -5,10 +5,22 @@ @@ -70,5 +70,5 @@ index 620b9490e..a8bdaaeaa 100644 -- -2.24.0 +2.25.1 diff --git a/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch b/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch index 86179bf8a..5bad5f5ce 100644 --- a/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch +++ b/Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch @@ -1,11 +1,11 @@ -From 3b94bf80be80647c75ad63c0858e94ddd67102bf Mon Sep 17 00:00:00 2001 +From a0aeb66881e3e84c2a5407d063d82f7de394c5e6 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:35 +0200 Subject: [PATCH] Include Log4J2 SLF4J implementation diff --git a/pom.xml b/pom.xml -index 7132e2021..9e06edfe2 100644 +index 5a230592c7..6f2fe9c26d 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,12 @@ @@ -22,5 +22,5 @@ index 7132e2021..9e06edfe2 100644 org.apache.logging.log4j log4j-iostreams -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch b/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch index d97380816..08cd86716 100644 --- a/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch +++ b/Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch @@ -1,4 +1,4 @@ -From fceb95f6c30cba36961d90cf4f666003509b54a3 Mon Sep 17 00:00:00 2001 +From b387c73dbdd9f6418d40c1d290fd1334dc3200ae Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 23 Sep 2017 21:07:20 +0200 Subject: [PATCH] Disable logger prefix for various plugins bypassing the @@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages show up correctly. diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml -index a8bdaaeaa..a9bb98765 100644 +index a8bdaaeaa1..a9bb987652 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -8,7 +8,8 @@ @@ -35,5 +35,5 @@ index a8bdaaeaa..a9bb98765 100644 -- -2.24.0 +2.25.1 diff --git a/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch index 69667388d..b9a85a2a3 100644 --- a/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch +++ b/Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch @@ -1,11 +1,11 @@ -From 29e465db3a37f912340a2a5e225dd8a18f3464f5 Mon Sep 17 00:00:00 2001 +From c2abf57d9f2f352fdb91ac63edf5966985e3cc6d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 28 Sep 2017 17:21:44 -0400 Subject: [PATCH] Add PlayerJumpEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 01ab2e151..399724d6a 100644 +index 046ef418f8..b0651dcfbf 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory; @@ -54,5 +54,5 @@ index 01ab2e151..399724d6a 100644 this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9)); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch b/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch index 8a2fff78d..a130da622 100644 --- a/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch +++ b/Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch @@ -1,4 +1,4 @@ -From e5944274798212c32b8562cd16a803d101f13e2f Mon Sep 17 00:00:00 2001 +From 0c913b8e40c90661a114f2387020d5967d32eb78 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 5 Oct 2017 01:54:07 +0100 Subject: [PATCH] handle PacketPlayInKeepAlive async @@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing random disconnections for clients. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index b0651dcfb..d4a649a83 100644 +index b0651dcfbf..d4a649a83f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2487,14 +2487,18 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -40,5 +40,5 @@ index b0651dcfb..d4a649a83 100644 } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch index 0884986d8..a1371b675 100644 --- a/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-Server-Patches/0177-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From 2f46af2d4c7bc61d9f51358a60862fc1bf781f7e Mon Sep 17 00:00:00 2001 +From 357e241e7a83d0a0c6ed04ae4859587066247d30 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:45:20 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java new file mode 100644 -index 000000000..5caca6439 +index 0000000000..5caca6439d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java @@ -0,0 +1,50 @@ @@ -61,7 +61,7 @@ index 000000000..5caca6439 + +} diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index d0b9c6e3d..8928d93e4 100644 +index d0b9c6e3dc..8928d93e49 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener { @@ -84,7 +84,7 @@ index d0b9c6e3d..8928d93e4 100644 @Override diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 3ccf16636..e2d8ed88f 100644 +index 3ccf166366..e2d8ed88f0 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -99,7 +99,7 @@ index 3ccf16636..e2d8ed88f 100644 public NetworkManager(EnumProtocolDirection enumprotocoldirection) { this.h = enumprotocoldirection; diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java -index 4f008e472..8545146fb 100644 +index 4f008e4723..8545146fb1 100644 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet Date: Sun, 15 Oct 2017 00:29:07 +0100 Subject: [PATCH] revert serverside behavior of keepalives @@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients, at the cost of dead connections being kept open for longer. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index a4660f2b8..9af8e947e 100644 +index d4a649a83f..2a3771d065 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -74,5 +74,5 @@ index a4660f2b8..9af8e947e 100644 this.minecraftServer.getMethodProfiler().exit(); // CraftBukkit start -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch b/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch index 0e500a0e6..1f101f328 100644 --- a/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch +++ b/Spigot-Server-Patches/0179-Send-attack-SoundEffects-only-to-players-who-can-see.patch @@ -1,4 +1,4 @@ -From 781c4627c43e07dfca1b3c05f1dde05b08fb178f Mon Sep 17 00:00:00 2001 +From c02f4c3f44c8762e99eeb084c806c16f2910c5fe Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 31 Oct 2017 03:26:18 +0100 Subject: [PATCH] Send attack SoundEffects only to players who can see the @@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 3bd5ddba6..c86d22e7a 100644 +index 3bd5ddba68..c86d22e7ae 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1023,6 +1023,15 @@ public abstract class EntityHuman extends EntityLiving { @@ -72,7 +72,7 @@ index 3bd5ddba6..c86d22e7a 100644 entity.extinguish(); } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bfb682ebb..6c3cd19be 100644 +index bfb682ebbd..6c3cd19be1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -582,6 +582,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -88,5 +88,5 @@ index bfb682ebb..6c3cd19be 100644 public abstract void playSound(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch b/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch index f8d16145f..e83e03a99 100644 --- a/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch +++ b/Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch @@ -1,11 +1,11 @@ -From 50a68d7b2efc0d066f9a0b327e39f3b2a2fae2df Mon Sep 17 00:00:00 2001 +From cab727503baa63f9dd0f50b9bada3ea554a404d5 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 10 Nov 2017 23:03:12 -0500 Subject: [PATCH] Option for maximum exp value when merging orbs diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 39ab54575..d2582d981 100644 +index 39ab545756..d2582d981f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -340,4 +340,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 39ab54575..d2582d981 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index c45b7c15f..dbda8b35a 100644 +index c45b7c15fc..dbda8b35aa 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -542,16 +542,32 @@ public class CraftEventFactory { @@ -60,5 +60,5 @@ index c45b7c15f..dbda8b35a 100644 // Spigot end } else if (!(entity instanceof EntityPlayer)) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch index 2ddc19203..17b33b779 100644 --- a/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch +++ b/Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch @@ -1,11 +1,11 @@ -From 59e3a903221a2e6d6dfb17758238b93701debbbd Mon Sep 17 00:00:00 2001 +From 4971f3493441d4522d32bb68cc230904d169fd37 Mon Sep 17 00:00:00 2001 From: pkt77 Date: Fri, 10 Nov 2017 23:46:34 -0500 Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index c7b62872c..fe0b08220 100644 +index c7b62872c4..fe0b082206 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1,5 +1,6 @@ @@ -30,7 +30,7 @@ index c7b62872c..fe0b08220 100644 if (!itemstack.isEmpty()) { this.getAttributeMap().a(itemstack.a(enumitemslot)); diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java -index 02a7ae678..60b235f16 100644 +index 02a7ae6785..60b235f16f 100644 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java @@ -16,6 +16,7 @@ public enum EnumItemSlot { @@ -42,5 +42,5 @@ index 02a7ae678..60b235f16 100644 return this.g; } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch b/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch index beb41f4f3..5cf7f757a 100644 --- a/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch +++ b/Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch @@ -1,4 +1,4 @@ -From a5f884dbea930849d5e6cb21f046f01109d4707b Mon Sep 17 00:00:00 2001 +From 27b2bf36570fce673b15bb60da0050e7cccb364c Mon Sep 17 00:00:00 2001 From: killme Date: Sun, 12 Nov 2017 19:40:01 +0100 Subject: [PATCH] Prevent logins from being processed when the player has @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 758fe7748..1fb609dcf 100644 +index 758fe77489..1fb609dcfc 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener { @@ -23,5 +23,5 @@ index 758fe7748..1fb609dcf 100644 EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId()); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch index 490d02cf1..94c176046 100644 --- a/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch +++ b/Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch @@ -1,4 +1,4 @@ -From 0a49d9acec9fccf1b2b22b5e6f673dc73c994316 Mon Sep 17 00:00:00 2001 +From a1c2dd16c28bafd489c044b329e83f9165d3e597 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 16 Nov 2017 12:12:41 +0000 Subject: [PATCH] use CB BlockState implementations for captured blocks @@ -18,7 +18,7 @@ the blockstate that will be valid for restoration, as opposed to dropping information on restoration when the event is cancelled. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 6c3cd19be..f349c7fe2 100644 +index 6c3cd19be1..f349c7fe2e 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -66,7 +66,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -58,5 +58,5 @@ index 6c3cd19be..f349c7fe2 100644 return previous.getHandle(); } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch index 26f4c3854..68274ce37 100644 --- a/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch +++ b/Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch @@ -1,4 +1,4 @@ -From 8ca75647c77e87e68810468aec0066d3c9280385 Mon Sep 17 00:00:00 2001 +From 8ef55353c0d875913003f0b76b3350e403464c99 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 6 Nov 2017 21:08:22 -0500 Subject: [PATCH] API to get a BlockState without a snapshot @@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE If Tile Entity was null, correct Sign to return empty lines instead of null diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 630b27915..958279249 100644 +index 630b279158..958279249f 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -39,7 +39,7 @@ index 630b27915..958279249 100644 return null; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index c0f557568..fa840c3d3 100644 +index c0f557568d..fa840c3d38 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -309,6 +309,20 @@ public class CraftBlock implements Block { @@ -64,7 +64,7 @@ index c0f557568..fa840c3d3 100644 switch (material) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index 17d80b5c6..f6401e2cd 100644 +index 17d80b5c6e..f6401e2cde 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -26,20 +26,40 @@ public class CraftBlockEntityState extends CraftBlockState @@ -114,7 +114,7 @@ index 17d80b5c6..f6401e2cd 100644 private T createSnapshot(T tileEntity) { diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java -index 15022ada0..af15656cc 100644 +index 15022ada0c..af15656cc4 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState implements @@ -131,5 +131,5 @@ index 15022ada0..af15656cc 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch b/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch index f56dd5407..61ab32dad 100644 --- a/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch +++ b/Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch @@ -1,4 +1,4 @@ -From fbf5b2aff866d85d2c1744ad445c0aa56a8ee2b0 Mon Sep 17 00:00:00 2001 +From 0576e19db0d775933920f1cb9162db2501a793dc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Nov 2017 13:19:58 -0500 Subject: [PATCH] AsyncTabCompleteEvent @@ -14,7 +14,7 @@ completion, such as offline players. Also adds isCommand and getLocation to the sync TabCompleteEvent diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2a3771d06..64f789d7c 100644 +index 2a3771d065..64f789d7c4 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -524,10 +524,10 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -72,7 +72,7 @@ index 2a3771d06..64f789d7c 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 8d23eb0e7..b7eaa0fef 100644 +index 8d23eb0e7b..b7eaa0fef9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1709,7 +1709,7 @@ public final class CraftServer implements Server { @@ -85,7 +85,7 @@ index 8d23eb0e7..b7eaa0fef 100644 return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions(); diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java -index 5510266fb..a51202ed5 100644 +index 5510266fb1..a51202ed53 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer { @@ -129,5 +129,5 @@ index 5510266fb..a51202ed5 100644 Waitable> waitable = new Waitable>() { @Override -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch b/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch index e7d8b57fa..89a45e6ed 100644 --- a/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch +++ b/Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch @@ -1,11 +1,11 @@ -From fad81fed4375e1773483c5c5aedbaac86b273ee3 Mon Sep 17 00:00:00 2001 +From 2b3b0cbd50b62a4cbb5aefd0b332e23b44e6caef Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 29 Nov 2017 22:18:54 -0500 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java -index eafdcb916..d37a2fa0a 100644 +index eafdcb916a..d37a2fa0ab 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal { @@ -18,5 +18,5 @@ index eafdcb916..d37a2fa0a 100644 } } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch b/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch index 83ee76091..85b4cdc99 100644 --- a/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch +++ b/Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch @@ -1,4 +1,4 @@ -From 56a4ee76472e9a5f1ff0f87ce17861a6e6f02902 Mon Sep 17 00:00:00 2001 +From 0823f1c7545f4e5c4a1ee0ae4f16987b820e34f7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:02:53 -0500 Subject: [PATCH] PlayerPickupExperienceEvent @@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent Allows plugins to cancel a player picking up an experience orb diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index d4275e733..b3edb69a9 100644 +index d4275e733d..b3edb69a96 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity { @@ -19,5 +19,5 @@ index d4275e733..b3edb69a9 100644 entityhuman.receive(this, 1); Entry entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch b/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch index be071c0ec..617179c7c 100644 --- a/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch +++ b/Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch @@ -1,4 +1,4 @@ -From 622d39c492cb528a355db488bf741826bd1dfd6f Mon Sep 17 00:00:00 2001 +From 12dcb77bba6dddc5a70327d0b537909f14e70614 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 22:57:26 -0500 Subject: [PATCH] ExperienceOrbMergeEvent @@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor metadata such as spawn reason, or conditionally move data from source to target. diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index dbda8b35a..f9b0f39f7 100644 +index dbda8b35aa..f9b0f39f78 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -552,7 +552,7 @@ public class CraftEventFactory { @@ -21,5 +21,5 @@ index dbda8b35a..f9b0f39f7 100644 if ((int) newTotal < 0) continue; // Overflow if (maxValue > 0 && newTotal > (long)maxValue) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch b/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch index 0b638f883..d3e047abd 100644 --- a/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-Server-Patches/0189-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From 946f1ed01e757565fd7814a4f49b89d63962c69f Mon Sep 17 00:00:00 2001 +From 11fd8feec557b491e9eb6bdf03b4ab3edd2119e7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:36:49 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,7 +10,7 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java -index 1822178e8..d96c03a1a 100644 +index 1822178e8d..d96c03a1a1 100644 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java @@ -246,6 +246,11 @@ public class EnchantmentManager { @@ -26,7 +26,7 @@ index 1822178e8..d96c03a1a 100644 public static Entry b(Enchantment enchantment, EntityLiving entityliving) { Map map = enchantment.a(entityliving); diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index b3edb69a9..87c6b77ce 100644 +index b3edb69a96..87c6b77ce3 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -254,10 +254,12 @@ public class EntityExperienceOrb extends Entity { @@ -43,7 +43,7 @@ index b3edb69a9..87c6b77ce 100644 return i * 2; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5b5f2418e..6f47768c9 100644 +index 5b5f2418eb..6f47768c9d 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1053,8 +1053,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -86,5 +86,5 @@ index 5b5f2418e..6f47768c9 100644 } -- -2.16.1.windows.4 +2.25.1 diff --git a/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch b/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch index bddc320b3..cf2c5f830 100644 --- a/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch +++ b/Spigot-Server-Patches/0190-Make-max-squid-spawn-height-configurable.patch @@ -1,4 +1,4 @@ -From f6c29fb849a36f83268ede7c5c0f4dc0b6e0c506 Mon Sep 17 00:00:00 2001 +From fede97cace00c5730920e207569e01eb725ed0c0 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 11 Jan 2018 16:47:28 -0600 Subject: [PATCH] Make max squid spawn height configurable @@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but whatever diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index d2582d981..92e689150 100644 +index d2582d981f..92e6891502 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -346,4 +346,9 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index d2582d981..92e689150 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 8c4f3b2c2..1c1ff2069 100644 +index 8c4f3b2c2e..1c1ff2069d 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal { @@ -35,5 +35,5 @@ index 8c4f3b2c2..1c1ff2069 100644 public void a(float f, float f1, float f2) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch b/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch index e0ebf79cd..6df6e08ff 100644 --- a/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch +++ b/Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch @@ -1,4 +1,4 @@ -From ae58ae6165d9295d062541494b29fcc8e70c95ec Mon Sep 17 00:00:00 2001 +From 47f642cc207303a6afcdc93b2f5feaa19349a945 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:01:31 -0500 Subject: [PATCH] PreCreatureSpawnEvent @@ -15,7 +15,7 @@ instead and save a lot of server resources. See: https://github.com/PaperMC/Paper/issues/917 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 258e96ba5..fe8bc7f75 100644 +index c38295a09d..43c491f71b 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -105,6 +105,27 @@ public abstract class MobSpawnerAbstract { @@ -47,7 +47,7 @@ index 258e96ba5..fe8bc7f75 100644 entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch); return entity1; diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 02157d051..224443e03 100644 +index 02157d051f..224443e03c 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -38,7 +38,7 @@ public final class SpawnerCreature { @@ -86,5 +86,5 @@ index 02157d051..224443e03 100644 Entity entity = entitytypes.a((World) worldserver); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch b/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch index 52db688ac..6f5474409 100644 --- a/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch +++ b/Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch @@ -1,4 +1,4 @@ -From b918e704817561a55e71d2917d958f4386822126 Mon Sep 17 00:00:00 2001 +From 27922d38f4079c2750c243e416b640de9352799a Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 14 Jan 2018 17:36:02 -0500 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent @@ -9,7 +9,7 @@ from triggering monster spawns on a server. Also a highly more effecient way to blanket block spawns in a world diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index c83e0cd4e..71db32bdd 100644 +index e5d89299f6..96ac76c134 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -508,6 +508,15 @@ public class ChunkProviderServer extends IChunkProvider { @@ -29,7 +29,7 @@ index c83e0cd4e..71db32bdd 100644 Optional optional = ((Either) playerchunk.b().getNow(PlayerChunk.UNLOADED_CHUNK)).left(); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 1296eb04f..625b68428 100644 +index 1296eb04f0..625b684287 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1,5 +1,6 @@ @@ -48,7 +48,7 @@ index 1296eb04f..625b68428 100644 public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 936fc4f6b..fcf229ad5 100644 +index 936fc4f6b9..fcf229ad5d 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -881,12 +881,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -78,5 +78,5 @@ index 936fc4f6b..fcf229ad5 100644 } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch index 13cbb323b..a74eefad2 100644 --- a/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch @@ -1,4 +1,4 @@ -From 1b76177661b7b4000b35f129e23b5acc9c5ccb9e Mon Sep 17 00:00:00 2001 +From fc10f8c932094ea48409d91d5b7c286a42adb2bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 19 Jan 2018 00:36:25 -0500 Subject: [PATCH] Add setPlayerProfile API for Skulls @@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo which commonly cause rate limit issues with Mojang API diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java -index a4bc7f970..2dd2f476f 100644 +index a4bc7f9701..2dd2f476f0 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java @@ -1,5 +1,7 @@ @@ -48,7 +48,7 @@ index a4bc7f970..2dd2f476f 100644 public BlockFace getRotation() { BlockData blockData = getBlockData(); diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -index 4fb27cc7e..96d62bbf8 100644 +index 4fb27cc7ed..96d62bbf88 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java @@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory; @@ -89,5 +89,5 @@ index 4fb27cc7e..96d62bbf8 100644 public OfflinePlayer getOwningPlayer() { if (hasOwner()) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch b/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch index 36cfeccb0..89b77cf3d 100644 --- a/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch +++ b/Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch @@ -1,4 +1,4 @@ -From 15e137ea3e7641dfc321dd6794ca6570a071c3eb Mon Sep 17 00:00:00 2001 +From 3f27703850252713fd6574d265c8caad71847b20 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 2 Jan 2018 00:31:26 -0500 Subject: [PATCH] Fill Profile Property Events @@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results. This is useful for implementing a ProfileCache for Player Skulls diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java -index 4b2a67423..61cfdf73c 100644 +index 4b2a67423f..61cfdf73c8 100644 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java @@ -1,5 +1,7 @@ @@ -40,5 +40,5 @@ index 4b2a67423..61cfdf73c 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch b/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch index 88ce29a0f..f5045ae00 100644 --- a/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch +++ b/Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch @@ -1,11 +1,11 @@ -From 8c2dcc35a8e476df663dae550749a05544f9aff7 Mon Sep 17 00:00:00 2001 +From a8c6001fe5db7539f88f646d7d5eb2f696e0c512 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Jan 2018 08:15:29 -0600 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java -index ca661f393..c41e13847 100644 +index ca661f3933..c41e138472 100644 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -276,6 +276,12 @@ public class AdvancementDataPlayer { @@ -22,5 +22,5 @@ index ca661f393..c41e13847 100644 this.i.add(advancement); flag = true; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch index 682926030..229448125 100644 --- a/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From bea52b5cc2a373d9fc26866293ca778d6ef784b1 Mon Sep 17 00:00:00 2001 +From da394890b3d09b3f04b96db7370d5ab7f5a25f5d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:04:14 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -267,7 +267,7 @@ index f700522840..3723faccac 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 84f489a66d..3325111f8a 100644 +index bd9e09f999..0682c6e859 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1429,7 +1429,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { @@ -308,5 +308,5 @@ index 6302339601..3a82bede7c 100644 return cleanStack; } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch b/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch index b1be6e6d6..e02d8003a 100644 --- a/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch +++ b/Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch @@ -1,4 +1,4 @@ -From 7a62ac52f1526a199a76ac57ee3a1e10b6a7ff9a Mon Sep 17 00:00:00 2001 +From afa8825160769feb030e751d9fc2f2732bf2c42d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Feb 2018 10:43:46 +0000 Subject: [PATCH] Extend Player Interact cancellation @@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds when cancelling interaction. diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java -index dff3eb118..e2e5c17c2 100644 +index dff3eb1188..e2e5c17c24 100644 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java @@ -137,6 +137,11 @@ public class PlayerInteractManager { @@ -55,5 +55,5 @@ index dff3eb118..e2e5c17c2 100644 enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS; } else if (this.gamemode == EnumGamemode.SPECTATOR) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch b/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch index 5ce60c304..351d71d53 100644 --- a/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch +++ b/Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 7213a8b3e9d24e4811f63257c67aca9619b0ac5e Mon Sep 17 00:00:00 2001 +From 0d7c76b8b8abda694580589ff8aead9247d81c2f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 24 Feb 2018 01:14:55 -0500 Subject: [PATCH] Tameable#getOwnerUniqueId API @@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause an OfflinePlayer to be loaded from disk. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java -index 9952db3eb..1aea5f3f0 100644 +index 9952db3eb5..1aea5f3f05 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac @@ -21,7 +21,7 @@ index 9952db3eb..1aea5f3f0 100644 return getHandle().getOwnerUUID(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java -index 5dfa40dda..407b95caf 100644 +index 5dfa40dda1..407b95cafd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat @@ -35,5 +35,5 @@ index 5dfa40dda..407b95caf 100644 try { return getHandle().getOwnerUUID(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch b/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch index 42ff339bf..3072c3b26 100644 --- a/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch +++ b/Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch @@ -1,11 +1,11 @@ -From cf3d6673746b149e8c9fef6cfd96601b8958466b Mon Sep 17 00:00:00 2001 +From 6c2bfd814f3b7de618aecd0ddb77fabf622d8a7f Mon Sep 17 00:00:00 2001 From: MiniDigger Date: Sat, 10 Mar 2018 00:50:24 +0100 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 92e689150..77cdbfadf 100644 +index 92e6891502..77cdbfadf9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -187,6 +187,11 @@ public class PaperWorldConfig { @@ -21,7 +21,7 @@ index 92e689150..77cdbfadf 100644 private void allChunksAreSlimeChunks() { allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false); diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index be8b088fc..ef9eabb83 100644 +index c86d22e7ae..3fe13fe489 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1063,6 +1063,7 @@ public abstract class EntityHuman extends EntityLiving { @@ -33,5 +33,5 @@ index be8b088fc..ef9eabb83 100644 if (flag2) { f *= 1.5F; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch index 56a629ee5..fcf534569 100644 --- a/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ b/Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch @@ -1,4 +1,4 @@ -From 77b76b34f7943945b14dba49b605e9cf132b1393 Mon Sep 17 00:00:00 2001 +From d48f8ffe7c980bd2e8c646dfb2c21669f20b2438 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Mar 2018 13:03:49 +0000 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened @@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index 5a9ac3960..fd31b9a6d 100644 +index 5a9ac3960d..fd31b9a6dc 100644 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder; @@ -27,5 +27,5 @@ index 5a9ac3960..fd31b9a6d 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch b/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch index 286bb86de..e0d5d6626 100644 --- a/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch +++ b/Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch @@ -1,11 +1,11 @@ -From cf9c139ba2c63601ec6e57502ff5e0f4e4f2182d Mon Sep 17 00:00:00 2001 +From 78c923236c7a238eabab0ff9c203ced8c36c26ac Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 10 Mar 2018 16:33:15 -0500 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java -index 5e414138e..638a0aa5a 100644 +index 5e414138e4..638a0aa5ae 100644 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java @@ -26,8 +26,8 @@ public class BlockIceFrost extends BlockIce { @@ -29,5 +29,5 @@ index 5e414138e..638a0aa5a 100644 if (j >= i) { boolean flag = false; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch b/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch index 342e925ef..4271b1a64 100644 --- a/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch +++ b/Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch @@ -1,4 +1,4 @@ -From 639d610ba835a9747908b8e5e64efa14b726ea31 Mon Sep 17 00:00:00 2001 +From 04090444d216cfef3013a9ecb2232fc318c30146 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 11 Mar 2018 14:13:33 -0400 Subject: [PATCH] Disable Explicit Network Manager Flushing @@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread. Renable flushing by passing -Dpaper.explicit-flush=true diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index e2d8ed88f..08e314af7 100644 +index e2d8ed88f0..08e314af7c 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -33,5 +33,5 @@ index e2d8ed88f..08e314af7 100644 if (this.t++ % 20 == 0) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch b/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch index 0c0cf1030..8b2e67efc 100644 --- a/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch +++ b/Spigot-Server-Patches/0203-Implement-extended-PaperServerListPingEvent.patch @@ -1,4 +1,4 @@ -From 82b2323c75b833cce83d74224d59f105b6603a6d Mon Sep 17 00:00:00 2001 +From b4279d84e7e4e55a7582391f805d011d0a27841b Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java new file mode 100644 -index 000000000..c1a8e295b +index 0000000000..c1a8e295b6 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java @@ -0,0 +1,31 @@ @@ -43,7 +43,7 @@ index 000000000..c1a8e295b +} diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java new file mode 100644 -index 000000000..a2a409e63 +index 0000000000..a2a409e635 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java @@ -0,0 +1,11 @@ @@ -60,7 +60,7 @@ index 000000000..a2a409e63 +} diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java new file mode 100644 -index 000000000..a85466bc7 +index 0000000000..a85466bc7e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java @@ -0,0 +1,112 @@ @@ -177,7 +177,7 @@ index 000000000..a85466bc7 + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index c15ca642d..7c268eb54 100644 +index c15ca642d0..7c268eb543 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,6 +1,9 @@ @@ -200,7 +200,7 @@ index c15ca642d..7c268eb54 100644 for (int k = 0; k < agameprofile.length; ++k) { diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java -index 658ea609c..4bb21c48b 100644 +index 658ea609cb..4bb21c48bd 100644 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java @@ -37,6 +37,8 @@ public class PacketStatusListener implements PacketStatusInListener { @@ -223,7 +223,7 @@ index 658ea609c..4bb21c48b 100644 // CraftBukkit end } diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java -index aa125a52d..ea52e89bd 100644 +index aa125a52dc..ea52e89bd9 100644 --- a/src/main/java/net/minecraft/server/ServerPing.java +++ b/src/main/java/net/minecraft/server/ServerPing.java @@ -29,6 +29,7 @@ public class ServerPing { @@ -248,7 +248,7 @@ index aa125a52d..ea52e89bd 100644 this.c = agameprofile; } diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java -index 6d77bbc5a..1cf214eac 100644 +index 6d77bbc5aa..1cf214eaca 100644 --- a/src/main/java/org/spigotmc/SpigotConfig.java +++ b/src/main/java/org/spigotmc/SpigotConfig.java @@ -285,7 +285,7 @@ public class SpigotConfig @@ -261,5 +261,5 @@ index 6d77bbc5a..1cf214eac 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch index 05ce2efc5..465bb19ee 100644 --- a/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From d64b180eee3b104b95e6ceba2583c2913a0c3749 Mon Sep 17 00:00:00 2001 +From 413d54fe3999269f138ff809b9fa7d9262579593 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler @@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue. diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java new file mode 100644 -index 000000000..3c1992e21 +index 0000000000..3c1992e212 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java @@ -0,0 +1,122 @@ @@ -159,7 +159,7 @@ index 000000000..3c1992e21 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index e102be583..5db848de1 100644 +index e102be583c..5db848de14 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -365,5 +365,5 @@ index e102be583..5db848de1 100644 private boolean isReady(final int currentTick) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 061701ce6..816ed49a3 100644 --- a/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -1,4 +1,4 @@ -From 27e6be6396d1f96cf3a7833ad89c9ba3b69fbebf Mon Sep 17 00:00:00 2001 +From 529f047dbeee3b24b5a426cad9ca6c7a66fd80f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 11:45:57 -0400 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 1fb609dcf..1b43f9216 100644 +index 1fb609dcfc..1b43f92164 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -1,5 +1,7 @@ @@ -44,5 +44,5 @@ index 1fb609dcf..1b43f9216 100644 if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) { final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch index 4a4adc85a..f4fdcf183 100644 --- a/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/0206-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From ff874f87d6b3546677bdb32fb6bd9b894e53bf97 Mon Sep 17 00:00:00 2001 +From 0a0f2bf32d1fa7ecc2d633a436998cf6209c901f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:29:48 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -141,5 +141,5 @@ index 6f47768c9d..15e33d7627 100644 public void removeDisconnectingPlayer(Player player) { hiddenPlayers.remove(player.getUniqueId()); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch b/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch index 901699daf..090022f6f 100644 --- a/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch +++ b/Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch @@ -1,4 +1,4 @@ -From cd9c5fb2772c2d4dbb2450cfaaad3bee55286884 Mon Sep 17 00:00:00 2001 +From 9e75b3f1f4d2c1aff58b26be43037c1f1d326b59 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 21 Mar 2018 20:52:07 -0400 Subject: [PATCH] Fix Dragon Server Crashes @@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge, it will infinitely keep looking for non air and eventually crash. diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java -index c42de9771..40a8beff5 100644 +index c42de9771e..40a8beff55 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -54,7 +54,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded @@ -20,5 +20,5 @@ index c42de9771..40a8beff5 100644 if (d3 < 0.0D) { d3 = d2; -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch index 400126522..56139a9d2 100644 --- a/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch +++ b/Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch @@ -1,4 +1,4 @@ -From 11f63e76b268644dda2fe2f734dba85352df2a30 Mon Sep 17 00:00:00 2001 +From 9f4935fd2dadab6fadb868d1aaa6a5cb61b90c95 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 22 Mar 2018 01:40:24 -0400 Subject: [PATCH] getPlayerUniqueId API @@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index b7eaa0fef..bc70d0fc7 100644 +index b7eaa0fef9..bc70d0fc79 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1402,6 +1402,26 @@ public final class CraftServer implements Server { @@ -40,5 +40,5 @@ index b7eaa0fef..bc70d0fc7 100644 @Deprecated public OfflinePlayer getOfflinePlayer(String name) { -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch b/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch index 972eb1eef..5ecd778ec 100644 --- a/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch +++ b/Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch @@ -1,11 +1,11 @@ -From 9e844af5534869173b64d8cc780ceb637c59467f Mon Sep 17 00:00:00 2001 +From 198909d1bf40f6a46c179c03261f925a7cbb8e0d Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 26 Mar 2018 18:30:53 +0300 Subject: [PATCH] Make player data saving configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 5884b04f7..ba341e017 100644 +index 5884b04f7e..ba341e0174 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -270,4 +270,13 @@ public class PaperConfig { @@ -23,7 +23,7 @@ index 5884b04f7..ba341e017 100644 + } } diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index a0254d8e5..e60e10c57 100644 +index a0254d8e51..e60e10c57d 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -35,5 +35,5 @@ index a0254d8e5..e60e10c57 100644 NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound()); File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp"); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch index 387c111e7..80ecf6024 100644 --- a/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From e00d41b0c5e486b4a9b2f5305c2fdbb2f8220205 Mon Sep 17 00:00:00 2001 +From 93a16e281fb254711122b786e4481ff6e88cd527 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 18:22:50 +0200 Subject: [PATCH] Make legacy ping handler more reliable @@ -28,7 +28,7 @@ respond to the request. [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index 9ee5a1ff0..063efe9bb 100644 +index 9ee5a1ff02..063efe9bbe 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter { @@ -167,5 +167,5 @@ index 9ee5a1ff0..063efe9bb 100644 channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE); } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch index 314ec68ad..5897922fd 100644 --- a/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From 9a3e5b4bf61d8ca313389ffc04567a30b9d0b12c Mon Sep 17 00:00:00 2001 +From 9e469b554d046c3b7b8de24b5af049d6ffb8064f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:51 +0200 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings @@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java new file mode 100644 -index 000000000..74c012fd4 +index 0000000000..74c012fd40 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java @@ -0,0 +1,73 @@ @@ -84,7 +84,7 @@ index 000000000..74c012fd4 + +} diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java -index 063efe9bb..4a49fe4cc 100644 +index 063efe9bbe..4a49fe4cc6 100644 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java @@ -1,5 +1,7 @@ @@ -153,5 +153,5 @@ index 063efe9bb..4a49fe4cc 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch b/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch index db9bada52..72af31126 100644 --- a/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch +++ b/Spigot-Server-Patches/0212-Flag-to-disable-the-channel-limit.patch @@ -1,4 +1,4 @@ -From ad3f3b50762b459a49bbcf32daad5a5c2aaf1157 Mon Sep 17 00:00:00 2001 +From 7dd957d03a19a278b167889c04cbc3b96edf4807 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Mar 2018 17:04:26 +0100 Subject: [PATCH] Flag to disable the channel limit @@ -30,5 +30,5 @@ index 15e33d7627..52640237ae 100644 if (channels.add(channel)) { server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel)); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch b/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch index f5e5856f0..facc2f1d6 100644 --- a/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch +++ b/Spigot-Server-Patches/0213-Add-method-to-open-already-placed-sign.patch @@ -1,11 +1,11 @@ -From 1307fc5c788198525489a1f45868d5b885e17c5f Mon Sep 17 00:00:00 2001 +From 1386fb4e37a89df468e11ec20b796101c237b085 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:29:37 +0300 Subject: [PATCH] Add method to open already placed sign diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java -index a1397d142..cd8ad2704 100644 +index a1397d1427..cd8ad27047 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -764,4 +764,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { @@ -27,5 +27,5 @@ index a1397d142..cd8ad2704 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch b/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch index f4cbb0bca..134a152e6 100644 --- a/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch +++ b/Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch @@ -1,4 +1,4 @@ -From 5e79b0383c61e9474b21ecfa7805505bda9459a4 Mon Sep 17 00:00:00 2001 +From b1f8ee2e1199e0b6654015f48671f27a3024e128 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Sat, 14 Apr 2018 20:20:46 +0200 Subject: [PATCH] Configurable sprint interruption on attack @@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack If the sprint interruption is disabled players continue sprinting when they attack entities. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 77cdbfadf..171c8e303 100644 +index 77cdbfadf9..171c8e3031 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -356,4 +356,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index 77cdbfadf..171c8e303 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 0f12f8386..2b7c0a29d 100644 +index 60dd8672b1..1d3c7ce488 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -1112,7 +1112,11 @@ public abstract class EntityHuman extends EntityLiving { @@ -37,5 +37,5 @@ index 0f12f8386..2b7c0a29d 100644 if (flag3) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch b/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch index 3d22b49d7..b75f920d0 100644 --- a/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch +++ b/Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch @@ -1,11 +1,11 @@ -From cf29ee10de10c640a74260790a682363e672714c Mon Sep 17 00:00:00 2001 +From fecb823be50e81323a8892d9a85585651cfde873 Mon Sep 17 00:00:00 2001 From: 0x22 <0x22@futureclient.net> Date: Thu, 26 Apr 2018 04:41:11 -0400 Subject: [PATCH] Fix exploit that allowed colored signs to be created diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 64f789d7c..4a0a84794 100644 +index 64f789d7c4..4a0a847944 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2502,7 +2502,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -18,5 +18,5 @@ index 64f789d7c..4a0a84794 100644 SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines); this.server.getPluginManager().callEvent(event); -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch b/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch index b1d9d3c74..8584a6f02 100644 --- a/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch +++ b/Spigot-Server-Patches/0216-EndermanEscapeEvent.patch @@ -1,4 +1,4 @@ -From 3be42a987d37a35a9a89ed6c41aa5c9e7bf7c1ee Mon Sep 17 00:00:00 2001 +From 8ab62be5ad0a6928a746d577fc9a3e4cd8c9170e Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:15:55 -0400 Subject: [PATCH] EndermanEscapeEvent @@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player You may cancel this, enabling ranged attacks to damage the enderman for example. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 1cc66108d..37ca65209 100644 +index 538c2169cd..2893f75bdf 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -81,5 +81,5 @@ index 1cc66108d..37ca65209 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch b/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch index f433ba3d0..7911edfe9 100644 --- a/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch +++ b/Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch @@ -1,4 +1,4 @@ -From 396e5ec1fbcb4993db13d4f7c6aa492e44d438b2 Mon Sep 17 00:00:00 2001 +From 79ec4af17c4c948e5a32d25e9ffe80914b7d01ff Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 13:29:44 -0400 Subject: [PATCH] Enderman.teleportRandomly() @@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly() Ability to trigger the vanilla "teleport randomly" mechanic of an enderman. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index 37ca65209..a1a5129a6 100644 +index 2893f75bdf..f279c9b148 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -193,6 +193,7 @@ public class EntityEnderman extends EntityMonster { @@ -18,7 +18,7 @@ index 37ca65209..a1a5129a6 100644 if (!this.world.p_() && this.isAlive()) { double d0 = this.locX() + (this.random.nextDouble() - 0.5D) * 64.0D; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java -index 970efabd3..0c5f35934 100644 +index 970efabd37..0c5f359346 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java @@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman { @@ -30,5 +30,5 @@ index 970efabd3..0c5f35934 100644 public MaterialData getCarriedMaterial() { IBlockData blockData = getHandle().getCarried(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch b/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch index 5d8516e12..22587ebd9 100644 --- a/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch +++ b/Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch @@ -1,4 +1,4 @@ -From 6470e4c8b90ae14c4b05f2d98e072c5c86917966 Mon Sep 17 00:00:00 2001 +From 886bb7e903925468d0b6b6b9766f980d1b5c023f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 30 Apr 2018 17:15:26 -0400 Subject: [PATCH] Block Enderpearl Travel Exploit @@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded. This is mainly useful for survival servers that do not allow freeform teleporting. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 171c8e303..9c52e31f4 100644 +index 171c8e3031..9c52e31f4c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -361,4 +361,10 @@ public class PaperWorldConfig { @@ -27,7 +27,7 @@ index 171c8e303..9c52e31f4 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 724b78b5d..9eed1dce3 100644 +index 724b78b5d2..9eed1dce3e 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -201,6 +201,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { @@ -39,5 +39,5 @@ index 724b78b5d..9eed1dce3 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch index 365e1f273..f3633945d 100644 --- a/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-Server-Patches/0219-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 2e74c7dc378fae5556ce1aa66d24e73e0668137c Mon Sep 17 00:00:00 2001 +From f48e9aa868bcfd797787755261307dc76b550cb6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 15 Aug 2017 22:29:12 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -66,5 +66,5 @@ index d3df3f593f..daf305bb14 100644 x, y, z, // Position count, // Count -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch b/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch index 362acc2b3..06d646ce9 100644 --- a/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch +++ b/Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch @@ -1,4 +1,4 @@ -From f6fc2c7854b5b579a9ff53da916d794497e37d98 Mon Sep 17 00:00:00 2001 +From 9f2bd9b9fb36353233446c2eb8f949571d2c63f9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 1 May 2018 20:18:54 -0400 Subject: [PATCH] EndermanAttackPlayerEvent @@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player. This allows you to override/extend the pumpkin/stare logic. diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index a1a5129a6..ca8e43fdf 100644 +index f279c9b148..b7c67f0cdb 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -141,7 +141,15 @@ public class EntityEnderman extends EntityMonster { @@ -28,5 +28,5 @@ index a1a5129a6..ca8e43fdf 100644 if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) { -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch b/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch index 9a3fbd683..593b48878 100644 --- a/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch +++ b/Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch @@ -1,4 +1,4 @@ -From 6c351f735cd500670e4b7519ee5d8bec7514bc20 Mon Sep 17 00:00:00 2001 +From abc9903c5d3cffce9396db4bd310053acd65fcb8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:35:16 -0400 Subject: [PATCH] WitchConsumePotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent Fires when a witch consumes the potion in their hand diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index ddff0b578..aa9011171 100644 +index ddff0b5786..aa90111716 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -88,7 +88,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -23,5 +23,5 @@ index ddff0b578..aa9011171 100644 if (list != null) { Iterator iterator = list.iterator(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch b/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch index 52a775aaa..0c5747da0 100644 --- a/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch +++ b/Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch @@ -1,4 +1,4 @@ -From 923a9bb5d957171880b0599f4c3ae1b83dd1185a Mon Sep 17 00:00:00 2001 +From a82024e65858dc3a1817b54e7a6e7fe845601021 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 16 May 2018 20:44:58 -0400 Subject: [PATCH] WitchThrowPotionEvent @@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent Fired when a witch throws a potion at a player diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index aa9011171..1f2759e95 100644 +index aa90111716..1f2759e95e 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -29,5 +29,5 @@ index aa9011171..1f2759e95 100644 entitypotion.shoot(d0, d1 + (double) (f1 * 0.2F), d2, 0.75F, 8.0F); this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_THROW, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch b/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch index 3975b119f..e4265d96b 100644 --- a/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch +++ b/Spigot-Server-Patches/0223-Allow-spawning-Item-entities-with-World.spawnEntity.patch @@ -1,4 +1,4 @@ -From f6cacd52c4f68c8acc21058322ede92a35b7a3ca Mon Sep 17 00:00:00 2001 +From 6948c27f93bb2267bcf9d3d30e199f75abd513d9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 4 Jun 2018 20:39:20 -0400 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity @@ -23,5 +23,5 @@ index daf305bb14..0b4821e16e 100644 entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z))); } else if (Projectile.class.isAssignableFrom(clazz)) { -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch b/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch index ccd656758..918a1c5ec 100644 --- a/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch +++ b/Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch @@ -1,11 +1,11 @@ -From ec353e040667da4498b275444cbd0e0b3d5a1eb9 Mon Sep 17 00:00:00 2001 +From 84886bc08d208239d33820ac7f88e50aa0afb7c9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 22:47:26 -0400 Subject: [PATCH] WitchReadyPotionEvent diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index 1f2759e95..be6ecfb08 100644 +index 1f2759e95e..be6ecfb08a 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -121,7 +121,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity { @@ -22,5 +22,5 @@ index 1f2759e95..be6ecfb08 100644 this.t(true); this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch b/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch index 19972186a..0501ce79e 100644 --- a/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch +++ b/Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch @@ -1,4 +1,4 @@ -From 73304cde973ae42e0f466ffda4c9b623ffc4066f Mon Sep 17 00:00:00 2001 +From 074c1511331d71376d9fd4ab4e57d5767daf279e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 5 Jun 2018 23:00:29 -0400 Subject: [PATCH] ItemStack#getMaxItemUseDuration @@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration Allows you to determine how long it takes to use a usable/consumable item diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 2f08979f0..1d2eb4a6e 100644 +index 854cffe6c9..641a52b968 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -548,6 +548,7 @@ public final class ItemStack { @@ -18,7 +18,7 @@ index 2f08979f0..1d2eb4a6e 100644 return this.getItem().f_(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index 3dd912abe..a41be8fda 100644 +index 3dd912abe3..a41be8fdae 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack { @@ -36,5 +36,5 @@ index 3dd912abe..a41be8fda 100644 public void addUnsafeEnchantment(Enchantment ench, int level) { Validate.notNull(ench, "Cannot add null enchantment"); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch b/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch index 9a58759c3..23c233ff5 100644 --- a/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch +++ b/Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch @@ -1,11 +1,11 @@ -From 1e19459784bfceba96d48192000c9a8f2f34b4ad Mon Sep 17 00:00:00 2001 +From f66371fedb36c176ab017137e3458f1576d4023e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Jun 2018 14:08:39 +0200 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java -index 78fba7937..c71f76004 100644 +index 78fba79378..c71f76004e 100644 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java @@ -145,8 +145,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick @@ -30,5 +30,5 @@ index 78fba7937..c71f76004 100644 this.h(); -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch b/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch index a71f93288..244d2aed3 100644 --- a/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch +++ b/Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch @@ -1,4 +1,4 @@ -From cdc3ed1642102a6f61d4eeb17950e734e03653cb Mon Sep 17 00:00:00 2001 +From 6fef741f0bb6edefa05c3c0187aaa134adae4a8f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 01:18:49 -0400 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event @@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event Otherwise the creeper infinite explodes diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index 374cf28fb..b89530079 100644 +index 374cf28fb4..b895300797 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster { @@ -27,5 +27,5 @@ index 374cf28fb..b89530079 100644 // CraftBukkit end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch b/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch index 82fc7ccf3..9982d3e8b 100644 --- a/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch +++ b/Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch @@ -1,4 +1,4 @@ -From 74ebd795cfb3e9be77acd0fefb44bba990daabd4 Mon Sep 17 00:00:00 2001 +From 7b47f14e65bc46b08bc4266d6c98a1901ecfda05 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 10 Jun 2018 20:20:15 -0400 Subject: [PATCH] Fix CraftEntity hashCode @@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle() However, replaced it too to make it clearer of intent. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index 495a7c464..915ccb180 100644 +index 495a7c464f..915ccb1807 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -723,14 +723,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { @@ -45,5 +45,5 @@ index 495a7c464..915ccb180 100644 @Override -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch b/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch index 04f463899..a6a4648d6 100644 --- a/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch +++ b/Spigot-Server-Patches/0229-Configurable-Alternative-LootPool-Luck-Formula.patch @@ -1,4 +1,4 @@ -From 428f1be4a81dd51929c799a41974145043559d8e Mon Sep 17 00:00:00 2001 +From eb10557d100cb75bdec93289ff0d1924211c1748 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 00:30:32 -0400 Subject: [PATCH] Configurable Alternative LootPool Luck Formula @@ -36,7 +36,7 @@ This change will result in some major changes to fishing formulas. I would love to see this change in Vanilla, so Mojang please pull :) diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index ba341e017..26ab855dc 100644 +index ba341e0174..26ab855dcf 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -279,4 +279,12 @@ public class PaperConfig { @@ -53,7 +53,7 @@ index ba341e017..26ab855dc 100644 + } } diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java -index 3ed6a1e78..03398ce8f 100644 +index 3ed6a1e785..03398ce8fd 100644 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java @@ -11,8 +11,8 @@ import org.apache.commons.lang3.ArrayUtils; @@ -109,5 +109,5 @@ index 3ed6a1e78..03398ce8f 100644 + // Paper end } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch b/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch index aaf95c9f9..088c9c0ec 100644 --- a/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch +++ b/Spigot-Server-Patches/0230-Print-Error-details-when-failing-to-save-player-data.patch @@ -1,11 +1,11 @@ -From 46d3879915b37e8353a50391d46c73486636cb73 Mon Sep 17 00:00:00 2001 +From 5ce8b664a007704371ee016d6074f7613c93f8f1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Jun 2018 20:37:03 -0400 Subject: [PATCH] Print Error details when failing to save player data diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java -index e60e10c57..350ac42d6 100644 +index e60e10c57d..350ac42d6b 100644 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java @@ -151,7 +151,7 @@ public class WorldNBTStorage implements IPlayerFileData { @@ -18,5 +18,5 @@ index e60e10c57..350ac42d6 100644 } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch b/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch index 08945b088..655105a3a 100644 --- a/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch +++ b/Spigot-Server-Patches/0231-Make-shield-blocking-delay-configurable.patch @@ -1,4 +1,4 @@ -From 3109d7b6ee99e8e3db3f72dabf6a27de3261f18a Mon Sep 17 00:00:00 2001 +From 89ae35b8b61c41741eb52a43ca58e7da52716494 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 16 Jun 2018 01:18:16 -0500 Subject: [PATCH] Make shield blocking delay configurable @@ -68,5 +68,5 @@ index 23a4819992..7d89c0e8e5 100644 // Paper end } -- -2.25.0 +2.25.1 diff --git a/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch index f8b8df0fa..677514617 100644 --- a/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch +++ b/Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch @@ -1,4 +1,4 @@ -From 403fc7f5a6970b4b9a8e61594897dc3fd34ef494 Mon Sep 17 00:00:00 2001 +From 8407818729bc6103258937ff4adff0011f2cea3b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 15 Jun 2013 19:51:17 -0400 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API @@ -6,7 +6,7 @@ Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API Adds ability to get what arrow was shot, and control if it should be consumed. diff --git a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java -index fb9656afd..3c95c0428 100644 +index fb9656afde..3c95c0428b 100644 --- a/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java +++ b/src/main/java/net/minecraft/server/EntitySkeletonAbstract.java @@ -157,7 +157,7 @@ public abstract class EntitySkeletonAbstract extends EntityMonster implements IR @@ -19,7 +19,7 @@ index fb9656afd..3c95c0428 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/net/minecraft/server/ItemBow.java b/src/main/java/net/minecraft/server/ItemBow.java -index 83aa70c29..26899916d 100644 +index 83aa70c295..26899916d3 100644 --- a/src/main/java/net/minecraft/server/ItemBow.java +++ b/src/main/java/net/minecraft/server/ItemBow.java @@ -36,6 +36,7 @@ public class ItemBow extends ItemProjectileWeapon { @@ -59,7 +59,7 @@ index 83aa70c29..26899916d 100644 if (itemstack1.isEmpty()) { entityhuman.inventory.f(itemstack1); diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java -index 7be41c869..60a47bccc 100644 +index 7be41c8698..60a47bccca 100644 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java @@ -221,7 +221,7 @@ public class ItemCrossbow extends ItemProjectileWeapon { @@ -72,7 +72,7 @@ index 7be41c869..60a47bccc 100644 event.getProjectile().remove(); return; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f9b0f39f7..caf277439 100644 +index f9b0f39f78..caf277439a 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -51,6 +51,7 @@ import net.minecraft.server.GeneratorAccess; diff --git a/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch b/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch index 8de75ff48..5b12f417d 100644 --- a/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch +++ b/Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch @@ -1,4 +1,4 @@ -From 84996a89580e1171c42e4871b8e82043622cc595 Mon Sep 17 00:00:00 2001 +From a4918790d6995478f6350a1884562d9ba203bbc7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 01:12:53 -0400 Subject: [PATCH] PlayerReadyArrowEvent @@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use. Plugins can skip selection of certain arrows and control which is used. diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 1d3c7ce48..4721c288b 100644 +index 1d3c7ce488..4721c288ba 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2157,6 +2157,17 @@ public abstract class EntityHuman extends EntityLiving { diff --git a/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch b/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch index ebfe36108..5ed972ba9 100644 --- a/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch +++ b/Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch @@ -1,11 +1,11 @@ -From 5cade1df1ba14c3675f0a17c9cfd62237313056f Mon Sep 17 00:00:00 2001 +From 34761a652b2d6eb4a9e2b5b9f0502280470ca706 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 18 Jun 2018 22:19:36 -0400 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner diff --git a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java -index 2ea0583a3..81b7cd06f 100644 +index 2ea0583a3e..81b7cd06f2 100644 --- a/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java +++ b/src/main/java/net/minecraft/server/EntityIllagerIllusioner.java @@ -138,8 +138,18 @@ public class EntityIllagerIllusioner extends EntityIllagerWizard implements IRan diff --git a/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch b/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch index 32ef60379..4d445c117 100644 --- a/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch +++ b/Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch @@ -1,4 +1,4 @@ -From 90dd27292788b75a84247749bc49342b85bc0f87 Mon Sep 17 00:00:00 2001 +From 385fbb42d914964afe6ef66622dba68c75006aee Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Mon, 18 Jun 2018 15:46:23 +0200 Subject: [PATCH] Implement EntityKnockbackByEntityEvent @@ -6,7 +6,7 @@ Subject: [PATCH] Implement EntityKnockbackByEntityEvent This event is called when an entity receives knockback by another entity. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a738848ec..2196dbfce 100644 +index a738848ecd..2196dbfce9 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1421,6 +1421,16 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0236-Expand-Explosions-API.patch b/Spigot-Server-Patches/0236-Expand-Explosions-API.patch index 6c5b01c41..15eba8dcc 100644 --- a/Spigot-Server-Patches/0236-Expand-Explosions-API.patch +++ b/Spigot-Server-Patches/0236-Expand-Explosions-API.patch @@ -1,4 +1,4 @@ -From aa958e0608ea7ac4b5d65e573be50869112e6dce Mon Sep 17 00:00:00 2001 +From 9e69a6e57d35c6cd554bc76a6b96d8bd3da870be Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Jun 2018 23:17:24 -0400 Subject: [PATCH] Expand Explosions API @@ -22,5 +22,5 @@ index 0b4821e16e..1787c2d205 100644 @Override public boolean createExplosion(Location loc, float power) { -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch b/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch index afd5e3eb5..2027f877b 100644 --- a/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch +++ b/Spigot-Server-Patches/0237-LivingEntity-Hand-Raised-Item-Use-API.patch @@ -1,4 +1,4 @@ -From d28986f2f3395d26ed21732afea59fb4d901903c Mon Sep 17 00:00:00 2001 +From e0690944f64dbb06474125fb98bd81579f98efa1 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 29 Jun 2018 00:21:28 -0400 Subject: [PATCH] LivingEntity Hand Raised/Item Use API @@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API How long an entity has raised hands to charge an attack or use an item diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 2196dbfce..fea821be1 100644 +index 2196dbfce9..fea821be1c 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity { @@ -32,7 +32,7 @@ index 2196dbfce..fea821be1 100644 return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 7d89c0e8e..02346f1c5 100644 +index 7d89c0e8e5..02346f1c50 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -654,5 +654,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0238-RangedEntity-API.patch b/Spigot-Server-Patches/0238-RangedEntity-API.patch index 878729875..0f143309a 100644 --- a/Spigot-Server-Patches/0238-RangedEntity-API.patch +++ b/Spigot-Server-Patches/0238-RangedEntity-API.patch @@ -1,4 +1,4 @@ -From 0d672c41952443ff1d66b7b9d20bd7123cc547b4 Mon Sep 17 00:00:00 2001 +From 449c1b103b950dc66deac0b506dc15aa8888be64 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 26 Jun 2018 22:00:49 -0400 Subject: [PATCH] RangedEntity API @@ -8,7 +8,7 @@ and to perform an attack. diff --git a/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java new file mode 100644 -index 000000000..696660b08 +index 0000000000..696660b089 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/CraftRangedEntity.java @@ -0,0 +1,19 @@ @@ -32,7 +32,7 @@ index 000000000..696660b08 + } +} diff --git a/src/main/java/net/minecraft/server/IRangedEntity.java b/src/main/java/net/minecraft/server/IRangedEntity.java -index b4178ce1e..9b79ac77d 100644 +index b4178ce1e8..9b79ac77db 100644 --- a/src/main/java/net/minecraft/server/IRangedEntity.java +++ b/src/main/java/net/minecraft/server/IRangedEntity.java @@ -2,5 +2,8 @@ package net.minecraft.server; @@ -46,7 +46,7 @@ index b4178ce1e..9b79ac77d 100644 + void q(boolean flag); default void setChargingAttack(boolean charging) { q(charging); }; // Paper } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java -index 2ec1af8be..f31d3eed3 100644 +index 2ec1af8be4..f31d3eed3a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftIllusioner.java @@ -1,11 +1,12 @@ @@ -64,7 +64,7 @@ index 2ec1af8be..f31d3eed3 100644 public CraftIllusioner(CraftServer server, EntityIllagerIllusioner entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java -index 23ab78da1..3f94c5a92 100644 +index 23ab78da15..3f94c5a920 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java @@ -1,5 +1,6 @@ @@ -84,7 +84,7 @@ index 23ab78da1..3f94c5a92 100644 public CraftLlama(CraftServer server, EntityLlama entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java -index b4ae89840..02df66ecf 100644 +index b4ae898401..02df66ecfe 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java @@ -1,11 +1,12 @@ @@ -102,7 +102,7 @@ index b4ae89840..02df66ecf 100644 public CraftSkeleton(CraftServer server, EntitySkeletonAbstract entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java -index 27460c59e..e482b1c9d 100644 +index 27460c59e3..e482b1c9dc 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java @@ -1,11 +1,12 @@ @@ -120,7 +120,7 @@ index 27460c59e..e482b1c9d 100644 super(server, entity); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java -index 244e4dc8e..bae107e76 100644 +index 244e4dc8ec..bae107e76e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -1,11 +1,12 @@ @@ -138,7 +138,7 @@ index 244e4dc8e..bae107e76 100644 super(server, entity); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java -index 38b555cc7..03cf6136e 100644 +index 38b555cc7e..03cf6136e6 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWither.java @@ -1,5 +1,6 @@ diff --git a/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch b/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch index 1036a8b29..99462d7fe 100644 --- a/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch +++ b/Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch @@ -1,4 +1,4 @@ -From 681f7cdd26add17101f6aa16c282001192ba78f9 Mon Sep 17 00:00:00 2001 +From c837eb577d0ddf3291dd2084c82ec62f895e4df1 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 22 Jun 2018 10:38:31 -0500 Subject: [PATCH] Add config to disable ender dragon legacy check @@ -47,5 +47,5 @@ index 0674811849..687efa022d 100644 if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) { if (nbttagcompound.b("DragonUUID")) { -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch b/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch index 915f5ed0e..ff3380d2c 100644 --- a/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch +++ b/Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch @@ -1,4 +1,4 @@ -From 79bd2ca7d9fa8e0c52298b9a0376b05c12bfd862 Mon Sep 17 00:00:00 2001 +From 7bc8aafd7975fa8fb64b0d6f520bdbd037cbfdd0 Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 3 Jul 2018 16:08:14 +0200 Subject: [PATCH] Implement World.getEntity(UUID) API @@ -25,5 +25,5 @@ index 1787c2d205..588c87119f 100644 public void save() { org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch b/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch index 0da9a9a22..36a0766fa 100644 --- a/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch +++ b/Spigot-Server-Patches/0241-InventoryCloseEvent-Reason-API.patch @@ -1,4 +1,4 @@ -From 5e0f54825c21adebcebb902f8483fbd33f500afd Mon Sep 17 00:00:00 2001 +From b00e40aeb2f62d8c8b83276a2e6224b1daff4cf5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 3 Jul 2018 21:56:23 -0400 Subject: [PATCH] InventoryCloseEvent Reason API @@ -193,5 +193,5 @@ index caf277439a..f931fa48b4 100644 human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity()); } -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch b/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch index 65b29b019..36ddbb2d4 100644 --- a/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch +++ b/Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch @@ -1,4 +1,4 @@ -From e1e34ffc3abb34c17b19e507d3e1d4972de73c4c Mon Sep 17 00:00:00 2001 +From 06cdbf697ba30e29c676c9f6ee6e4a72b0114655 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:22:06 -0400 Subject: [PATCH] Configurable Bed Search Radius @@ -10,7 +10,7 @@ player at their bed should it of became obstructed. Defaults to vanilla 1. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index cea15d50e..387e0dcb9 100644 +index cea15d50ed..387e0dcb9f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -377,4 +377,15 @@ public class PaperWorldConfig { @@ -30,7 +30,7 @@ index cea15d50e..387e0dcb9 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java -index 794756342..06a35629a 100644 +index 7947563426..06a35629ab 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/src/main/java/net/minecraft/server/BlockBed.java @@ -196,6 +196,10 @@ public class BlockBed extends BlockFacingHorizontal implements ITileEntity { diff --git a/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch b/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch index 786fe7695..fa10c903e 100644 --- a/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch +++ b/Spigot-Server-Patches/0243-Vex-getSummoner-API.patch @@ -1,4 +1,4 @@ -From 8b0a68363ba2615983a36bef836a4984eb19b3e4 Mon Sep 17 00:00:00 2001 +From 109c542b07b8b39e1a589823069f4ce128be11ec Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 15:30:22 -0400 Subject: [PATCH] Vex#getSummoner API @@ -6,7 +6,7 @@ Subject: [PATCH] Vex#getSummoner API Get's the NPC that summoned this Vex diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index cd9fb3aab..a46730460 100644 +index cd9fb3aabf..a46730460e 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -92,6 +92,7 @@ public class EntityVex extends EntityMonster { @@ -18,7 +18,7 @@ index cd9fb3aab..a46730460 100644 return this.c; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java -index 737a37b6f..169c951ec 100644 +index 737a37b6fe..169c951ec3 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -1,8 +1,10 @@ diff --git a/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch b/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch index bdd00ab90..96f4f66d3 100644 --- a/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch +++ b/Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch @@ -1,4 +1,4 @@ -From 90ec807ac72876f1190ff8144bcb600453c15175 Mon Sep 17 00:00:00 2001 +From c3cf0b6476dca8498ad71ef823d780fa6fd23b89 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 13 Jul 2018 14:54:43 +0200 Subject: [PATCH] Refresh player inventory when cancelling @@ -16,7 +16,7 @@ Refresh the player inventory when PlayerInteractEntityEvent is cancelled to avoid this problem. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8eb12e89e..8648845ac 100644 +index 8eb12e89ea..8648845acb 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1950,6 +1950,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch b/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch index b0206d4bb..64cb8507a 100644 --- a/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch +++ b/Spigot-Server-Patches/0245-Don-t-change-the-Entity-Random-seed-for-squids.patch @@ -1,11 +1,11 @@ -From 858907dcfa9ce67019472ceedb6dfb77919873ef Mon Sep 17 00:00:00 2001 +From a7fe914cc883f269049ea1b97502d320e4afe5f0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:05:00 -0400 Subject: [PATCH] Don't change the Entity Random seed for squids diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java -index 1c1ff2069..92efe4e7f 100644 +index 1c1ff2069d..92efe4e7f5 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal { diff --git a/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch b/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch index 45e7dc37f..100304b0e 100644 --- a/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch +++ b/Spigot-Server-Patches/0246-Re-add-vanilla-entity-warnings-for-duplicates.patch @@ -1,4 +1,4 @@ -From dc76e17c9b72ead6d04b2b1be4b3b3e1ae74d6c0 Mon Sep 17 00:00:00 2001 +From 6714752163ec229a2445503d005f5095b9befac6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:08:05 -0400 Subject: [PATCH] Re-add vanilla entity warnings for duplicates @@ -22,5 +22,5 @@ index c5b4218b44..4cbf390ce0 100644 } } -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch b/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch index 8110841c4..3abadc1eb 100644 --- a/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch +++ b/Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch @@ -1,11 +1,11 @@ -From 41308cf343500ec700daf71942ced419358d250c Mon Sep 17 00:00:00 2001 +From 14b56bdad0ae60dbb02b3d8cf0808465b63d5a44 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 16 Jul 2018 12:42:20 +0200 Subject: [PATCH] Avoid item merge if stack size above max stack size diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 5efcc50ab..e5c9bac88 100644 +index 5efcc50ab9..e5c9bac88a 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -170,6 +170,10 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch b/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch index 7b2e31949..574049f35 100644 --- a/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch +++ b/Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch @@ -1,11 +1,11 @@ -From e7ee3e6490bc87b238ba0fcb8cd1839abbf4d6a3 Mon Sep 17 00:00:00 2001 +From 2afc85c134cab7ce729e32a67bebcf7896462deb Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 17 Jul 2018 16:42:17 +0200 Subject: [PATCH] Use asynchronous Log4j 2 loggers diff --git a/pom.xml b/pom.xml -index 6f2fe9c26..55679af92 100644 +index 6f2fe9c26d..55679af926 100644 --- a/pom.xml +++ b/pom.xml @@ -74,6 +74,13 @@ @@ -24,7 +24,7 @@ index 6f2fe9c26..55679af92 100644 asm diff --git a/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java new file mode 100644 -index 000000000..db652a1f7 +index 0000000000..db652a1f7a --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/log/LogFullPolicy.java @@ -0,0 +1,17 @@ @@ -46,7 +46,7 @@ index 000000000..db652a1f7 + } +} diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties -index 0694b2146..30efeb5fa 100644 +index 0694b21465..30efeb5faf 100644 --- a/src/main/resources/log4j2.component.properties +++ b/src/main/resources/log4j2.component.properties @@ -1 +1,3 @@ diff --git a/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch b/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch index 6e6246a1a..453a85b52 100644 --- a/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch +++ b/Spigot-Server-Patches/0249-add-more-information-to-Entity.toString.patch @@ -1,4 +1,4 @@ -From 57d3e523f39ce4e5e2481c56340dcb707c4b23fe Mon Sep 17 00:00:00 2001 +From e696b3bbb9dc087f0f1613c525656648bbd624a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 19 Jul 2018 01:13:28 -0400 Subject: [PATCH] add more information to Entity.toString() diff --git a/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch b/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch index f67790228..d5eca87ed 100644 --- a/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch +++ b/Spigot-Server-Patches/0250-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch @@ -1,4 +1,4 @@ -From dbda58c0f89d4e42c4f779386aac8db45d91cbaa Mon Sep 17 00:00:00 2001 +From 9a76930aea280a0e6eab6f01334f409f4fccd808 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 08:25:40 -0400 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues @@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues Add -Ddebug.entities=true to your JVM flags to gain more information diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ec59ffc2e7..2612d60e38 100644 +index dce1e2af62..d39037a979 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -122,5 +122,5 @@ index 4cbf390ce0..6ce7f77a5e 100644 // CraftBukkit start - SPIGOT-5278 if (entity instanceof EntityDrowned) { -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0251-EnderDragon-Events.patch b/Spigot-Server-Patches/0251-EnderDragon-Events.patch index 7d6d01e1c..5b18513a6 100644 --- a/Spigot-Server-Patches/0251-EnderDragon-Events.patch +++ b/Spigot-Server-Patches/0251-EnderDragon-Events.patch @@ -1,11 +1,11 @@ -From 12f70d0e821fcf94e04d3ae07a5915f67c02734b Mon Sep 17 00:00:00 2001 +From eed44766d30a48ee5a4559f5ea3ffa4e5e03ef7c Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:51:27 -0500 Subject: [PATCH] EnderDragon Events diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java -index 40a8beff5..18fdcd453 100644 +index 40a8beff55..18fdcd453a 100644 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java @@ -71,7 +71,11 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded @@ -29,7 +29,7 @@ index 40a8beff5..18fdcd453 100644 public void e() { if (this.d != null) { diff --git a/src/main/java/net/minecraft/server/DragonControllerStrafe.java b/src/main/java/net/minecraft/server/DragonControllerStrafe.java -index a2c36548c..a9d20ee3b 100644 +index a2c36548ca..a9d20ee3bb 100644 --- a/src/main/java/net/minecraft/server/DragonControllerStrafe.java +++ b/src/main/java/net/minecraft/server/DragonControllerStrafe.java @@ -68,7 +68,9 @@ public class DragonControllerStrafe extends AbstractDragonController { @@ -43,7 +43,7 @@ index a2c36548c..a9d20ee3b 100644 if (this.d != null) { while (!this.d.b()) { diff --git a/src/main/java/net/minecraft/server/EntityDragonFireball.java b/src/main/java/net/minecraft/server/EntityDragonFireball.java -index bc08b53fc..db43ac1cc 100644 +index bc08b53fcd..db43ac1cc4 100644 --- a/src/main/java/net/minecraft/server/EntityDragonFireball.java +++ b/src/main/java/net/minecraft/server/EntityDragonFireball.java @@ -41,8 +41,10 @@ public class EntityDragonFireball extends EntityFireball { diff --git a/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch b/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch index 955b8dae9..ceea7e2c9 100644 --- a/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch +++ b/Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch @@ -1,11 +1,11 @@ -From 2e8a4e34c37924dbff4983f6b6aaeffe92253d17 Mon Sep 17 00:00:00 2001 +From 54f39c3f4e87f62020db7521485cba949b5364d9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 01:59:59 -0500 Subject: [PATCH] PlayerElytraBoostEvent diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java -index 92dac35ec..bd524a35b 100644 +index 92dac35ec4..bd524a35bb 100644 --- a/src/main/java/net/minecraft/server/ItemFireworks.java +++ b/src/main/java/net/minecraft/server/ItemFireworks.java @@ -36,11 +36,16 @@ public class ItemFireworks extends Item { diff --git a/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch b/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch index 0fca4cda8..8cb0a9e37 100644 --- a/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch +++ b/Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch @@ -1,4 +1,4 @@ -From 4256459777a7348525ce2230b1ec54a626df4830 Mon Sep 17 00:00:00 2001 +From 00af267858cee1ef342078231c7d1d227ae4c399 Mon Sep 17 00:00:00 2001 From: Techcable Date: Wed, 30 Nov 2016 20:56:58 -0600 Subject: [PATCH] Speedup BlockPos by fixing inlining @@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt They had 'callq' (invoke) instead of 'mov' (get from memory) instructions. diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java -index 71089442c..c439a8d01 100644 +index 71089442c1..c439a8d019 100644 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java @@ -7,25 +7,22 @@ import javax.annotation.concurrent.Immutable; @@ -110,7 +110,7 @@ index 71089442c..c439a8d01 100644 return (int) (f + f1 + f2); } diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index 5dbd3e60f..e9ea232a7 100644 +index 5dbd3e60fe..e9ea232a78 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -342,11 +342,13 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali diff --git a/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch b/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch index 212efd6f7..f1bb9cf19 100644 --- a/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch +++ b/Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch @@ -1,4 +1,4 @@ -From 52a2b3dbfdcd9dc9d17559be0f1eacc3a03f8cfa Mon Sep 17 00:00:00 2001 +From 9dcee9d8eca6917463de0000301d8d5780dea843 Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 23 Jul 2018 13:08:19 -0400 Subject: [PATCH] Optimize RegistryID.c() @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize RegistryID.c() This is a frequent hotspot for world loading/saving. diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java -index e15d28671..e8a48b9a4 100644 +index e15d286710..e8a48b9a4c 100644 --- a/src/main/java/net/minecraft/server/RegistryID.java +++ b/src/main/java/net/minecraft/server/RegistryID.java @@ -14,12 +14,14 @@ public class RegistryID implements Registry { diff --git a/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch b/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch index b31293ab3..0ddb59f37 100644 --- a/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch +++ b/Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch @@ -1,11 +1,11 @@ -From f693d754977454c76f680711e220d7565bbae95d Mon Sep 17 00:00:00 2001 +From b8661c328a854699d61a50a31d7cca9c6b46f680 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 12:57:39 +0200 Subject: [PATCH] Option to prevent armor stands from doing entity lookups diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 387e0dcb9..eaaa51e4b 100644 +index 387e0dcb9f..eaaa51e4bf 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -388,4 +388,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 387e0dcb9..eaaa51e4b 100644 + } } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index cab9ec5dd..749915198 100644 +index cab9ec5dd4..749915198b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -779,6 +779,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch b/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch index a2cd3a54b..aff71244f 100644 --- a/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch +++ b/Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch @@ -1,11 +1,11 @@ -From 1e468d382d6bf46a4ca53b22b3ab0afa0a95ae3a Mon Sep 17 00:00:00 2001 +From 2edf29d7e7a3d8bbdd274c88abb35fb204b5a249 Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Mon, 23 Jul 2018 14:22:26 +0200 Subject: [PATCH] Vanished players don't have rights diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 2612d60e3..d8f85eda0 100644 +index d39037a979..7378d531b6 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -98,7 +98,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -18,7 +18,7 @@ index 2612d60e3..d8f85eda0 100644 protected int j; @Nullable diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java -index 278ef79d8..5c3731f68 100644 +index 278ef79d89..5c3731f68a 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -110,6 +110,16 @@ public class EntityFireworks extends Entity implements IProjectile { @@ -39,7 +39,7 @@ index 278ef79d8..5c3731f68 100644 }, RayTrace.BlockCollisionOption.COLLIDER, true); diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index 3a1ad2346..9ab57be85 100644 +index 3a1ad2346b..9ab57be850 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -146,6 +146,7 @@ public class IBlockData extends BlockDataAbstract implements @@ -51,7 +51,7 @@ index 3a1ad2346..9ab57be85 100644 return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision); } diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java -index ab875a736..aed353365 100644 +index ab875a7365..aed353365b 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -136,7 +136,8 @@ public class ItemBlock extends Item { @@ -65,7 +65,7 @@ index ab875a736..aed353365 100644 BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn); diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java -index 0f64a3c05..0f95bcbcc 100644 +index 0f64a3c056..0f95bcbccb 100644 --- a/src/main/java/net/minecraft/server/VoxelShape.java +++ b/src/main/java/net/minecraft/server/VoxelShape.java @@ -46,6 +46,7 @@ public abstract class VoxelShape { @@ -77,7 +77,7 @@ index 0f64a3c05..0f95bcbcc 100644 return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2))); } diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java -index 143be566c..08c83c62d 100644 +index 143be566c6..08c83c62df 100644 --- a/src/main/java/net/minecraft/server/VoxelShapes.java +++ b/src/main/java/net/minecraft/server/VoxelShapes.java @@ -33,6 +33,7 @@ public final class VoxelShapes { @@ -97,7 +97,7 @@ index 143be566c..08c83c62d 100644 if (operatorboolean.apply(false, false)) { throw (IllegalArgumentException) SystemUtils.c(new IllegalArgumentException()); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 749915198..1905aae87 100644 +index 749915198b..1905aae877 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -152,6 +152,46 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -148,7 +148,7 @@ index 749915198..1905aae87 100644 public boolean p_() { return this.isClientSide; diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index f931fa48b..317a5bf4e 100644 +index f931fa48b4..317a5bf4ef 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -1171,6 +1171,14 @@ public class CraftEventFactory { @@ -167,5 +167,5 @@ index f931fa48b..317a5bf4e 100644 return event; } -- -2.25.0.windows.1 +2.25.1 diff --git a/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch b/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch index d2359d6cc..935e67977 100644 --- a/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch +++ b/Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch @@ -1,4 +1,4 @@ -From 08dec51859ba7c4f1206df43f6bd32dd53bf4cd1 Mon Sep 17 00:00:00 2001 +From 01bab6e4af8ccaf971cd4ea90a6675b967d62bc8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:18:31 -0400 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it @@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 3af311c6e..68cde3356 100644 +index 3af311c6eb..68cde33565 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -416,6 +416,7 @@ public class Chunk implements IChunkAccess { diff --git a/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch b/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch index 570ee9b59..6cb288e44 100644 --- a/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch +++ b/Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch @@ -1,4 +1,4 @@ -From e2bb3541dbb9a1f29b90e194cbe05bcc834e1a7c Mon Sep 17 00:00:00 2001 +From 1bf6b4b9f9a3d22b4f53574346c79bbeac1d6e90 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 23 Jul 2018 22:44:23 -0400 Subject: [PATCH] Add some Debug to Chunk Entity slices @@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created if the entity was to end up in 2 different chunk slices diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 68cde3356..1d47e4737 100644 +index 68cde33565..1d47e47370 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -407,6 +407,25 @@ public class Chunk implements IChunkAccess { @@ -57,7 +57,7 @@ index 68cde3356..1d47e4737 100644 return; } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index d8f85eda0..ace74179c 100644 +index 7378d531b6..356de07dad 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0259-EntityTransformedEvent.patch b/Spigot-Server-Patches/0259-EntityTransformedEvent.patch index edd75ba44..557042f12 100644 --- a/Spigot-Server-Patches/0259-EntityTransformedEvent.patch +++ b/Spigot-Server-Patches/0259-EntityTransformedEvent.patch @@ -1,11 +1,11 @@ -From 2ffe51580f5c462b8028922ca61bc36f6bc1a0c6 Mon Sep 17 00:00:00 2001 +From a06407e3b553f3cee196f93f47dd32f701ee1e17 Mon Sep 17 00:00:00 2001 From: Anthony MacAllister Date: Thu, 26 Jul 2018 15:30:03 -0400 Subject: [PATCH] EntityTransformedEvent diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java -index 19c12728d..3706c31aa 100644 +index 19c12728da..3706c31aad 100644 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java @@ -116,6 +116,7 @@ public class EntityMushroomCow extends EntityCow { @@ -17,7 +17,7 @@ index 19c12728d..3706c31aa 100644 this.die(); // CraftBukkit - from above diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 6ca4fa43c..6e0020ae0 100644 +index 6ca4fa43c4..6e0020ae0b 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java @@ -699,6 +699,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation @@ -29,7 +29,7 @@ index 6ca4fa43c..6e0020ae0 100644 // CraftBukkit end this.die(); diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 0240cef74..31aba6bfc 100644 +index 0240cef74a..31aba6bfc3 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -257,6 +257,7 @@ public class EntityZombie extends EntityMonster { @@ -49,7 +49,7 @@ index 0240cef74..31aba6bfc 100644 this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java -index 91cac5d53..8082fa617 100644 +index 91cac5d530..8082fa617a 100644 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java @@ -197,6 +197,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo diff --git a/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch b/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch index 54ca417b1..be55112f5 100644 --- a/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch +++ b/Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch @@ -1,11 +1,11 @@ -From 0ef80e45124c0ed6bc20f23cbc6da5ed15bd1cd7 Mon Sep 17 00:00:00 2001 +From 2def4b10aa913a36afc305f5e8e07c72190cfd8f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 27 Jul 2018 22:36:31 -0500 Subject: [PATCH] SkeletonHorse Additions diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java -index 621f2afee..290cb9337 100644 +index 621f2afee5..290cb9337c 100644 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java @@ -6,7 +6,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract { @@ -31,7 +31,7 @@ index 621f2afee..290cb9337 100644 if (flag != this.bG) { this.bG = flag; diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java -index dfe5a6358..37626f925 100644 +index dfe5a63583..37626f925f 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java @@ -15,6 +15,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal { @@ -43,7 +43,7 @@ index dfe5a6358..37626f925 100644 this.a.r(false); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java -index e822c2200..2a7d1d4ec 100644 +index e822c2200d..2a7d1d4ec2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeletonHorse.java @@ -26,4 +26,26 @@ public class CraftSkeletonHorse extends CraftAbstractHorse implements SkeletonHo diff --git a/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch b/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch index b06953026..6d6d17bd3 100644 --- a/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch +++ b/Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch @@ -1,4 +1,4 @@ -From 10efa52cd47217eb5757530232f015dcfa58b04e Mon Sep 17 00:00:00 2001 +From 372bb534db9407f2f0a153378e0390e995d6ec8f Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 26 Jul 2018 00:11:12 -0400 Subject: [PATCH] Prevent Saving Bad entities to chunks @@ -18,7 +18,7 @@ an invalid entity. This should reduce log occurrences of dupe uuid messages. diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 4af5a230b..6371f2f5b 100644 +index 4af5a230ba..6371f2f5b1 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -300,6 +300,7 @@ public class ChunkRegionLoader { diff --git a/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch index 9b22a0cef..7a6c6987f 100644 --- a/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -1,4 +1,4 @@ -From c30ebcb7dec21a9ab0a374cdd3527d7230417b1e Mon Sep 17 00:00:00 2001 +From 47537f82a6f5a0de4bb3d6e1a1ee09fa1135683a Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Thu, 26 Jul 2018 14:10:23 +0200 Subject: [PATCH] Don't call getItemMeta on hasItemMeta @@ -11,7 +11,7 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set. Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index a41be8fda..d5e8a7ee6 100644 +index a41be8fdae..d5e8a7ee6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -553,7 +553,7 @@ public final class CraftItemStack extends ItemStack { @@ -24,7 +24,7 @@ index a41be8fda..d5e8a7ee6 100644 static boolean hasItemMeta(net.minecraft.server.ItemStack item) { diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java -index 3a82bede7..d73141839 100644 +index 3a82bede7c..d731418397 100644 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java @@ -2,10 +2,9 @@ package org.bukkit.craftbukkit.inventory; diff --git a/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch b/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch index 7c48f8677..f12bfcbcb 100644 --- a/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch +++ b/Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch @@ -1,4 +1,4 @@ -From cd8b776c5d89065e2715a57d5c53906bcb241c62 Mon Sep 17 00:00:00 2001 +From e52d0934b4de9b05971b1d0e36731a771eaf9efc Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Jul 2018 12:18:27 -0400 Subject: [PATCH] Ignore Dead Entities in entityList iteration @@ -51,7 +51,7 @@ index 1d47e47370..c464d69623 100644 if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check list.add(t0); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ace74179ce..5d9d32ea45 100644 +index 356de07dad..33cd7f7b40 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -195,6 +195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -128,5 +128,5 @@ index 588c87119f..e94ac028df 100644 if (bukkitEntity == null) { -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch index dafc3ff75..98b940360 100644 --- a/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch +++ b/Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch @@ -1,4 +1,4 @@ -From b629f1e020482b5c3c7b8354aab7f82b04d492ee Mon Sep 17 00:00:00 2001 +From 9f9684fcca3fb42a4e44d5f0853e606323266fc0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Jul 2018 22:58:47 -0400 Subject: [PATCH] MC-111480: Start Entity ID's at 1 @@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5d9d32ea4..02aa493f1 100644 +index 33cd7f7b40..f54fc61aa5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch b/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch index 709ffc59d..3c64e0a2f 100644 --- a/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch +++ b/Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch @@ -1,4 +1,4 @@ -From 135ee7ade8be2ba0e4e172bd20ead8a359a9dfcc Mon Sep 17 00:00:00 2001 +From 3a95b20452b90efc74f4d8f24e7629e8692ba9c4 Mon Sep 17 00:00:00 2001 From: willies952002 Date: Thu, 26 Jul 2018 02:25:46 -0400 Subject: [PATCH] Implement Expanded ArmorStand API @@ -8,7 +8,7 @@ Add the following: - Enable/Disable slot interactions diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 992d7bfb0..61d7d507a 100644 +index 992d7bfb0f..61d7d507aa 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving { @@ -29,7 +29,7 @@ index 992d7bfb0..61d7d507a 100644 return (this.bB & 1 << enumitemslot.c()) != 0 || enumitemslot.a() == EnumItemSlot.Function.HAND && !this.hasArms(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index 124c3185b..d1d689e5d 100644 +index 124c3185bc..d1d689e5d7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -30,11 +30,13 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { diff --git a/Spigot-Server-Patches/0266-AnvilDamageEvent.patch b/Spigot-Server-Patches/0266-AnvilDamageEvent.patch index dcb41627a..2d0dc4d05 100644 --- a/Spigot-Server-Patches/0266-AnvilDamageEvent.patch +++ b/Spigot-Server-Patches/0266-AnvilDamageEvent.patch @@ -1,11 +1,11 @@ -From b7004155a4eece3f913e23e79f303e2e5c9a0f7c Mon Sep 17 00:00:00 2001 +From 4cd6e3dd2122d3311283a969eae5f8fdba3f1895 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 20 Jul 2018 23:37:03 -0500 Subject: [PATCH] AnvilDamageEvent diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java -index 1d9ce5ef1..286b930dd 100644 +index 1d9ce5ef1c..286b930ddb 100644 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container { diff --git a/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch index 368db18fb..667251c99 100644 --- a/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch @@ -1,11 +1,11 @@ -From 856dddfd5217457b7e3554c53d2b67f9618ffea3 Mon Sep 17 00:00:00 2001 +From ac17c29e5d0e7e952156b4321fc9dcb6f9752104 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 16 Jul 2018 00:05:05 +0300 Subject: [PATCH] Add TNTPrimeEvent diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java -index 0ece78d4d..1c30a0250 100644 +index 0ece78d4dc..1c30a02501 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/src/main/java/net/minecraft/server/BlockFire.java @@ -2,6 +2,7 @@ package net.minecraft.server; @@ -40,7 +40,7 @@ index 0ece78d4d..1c30a0250 100644 } } diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java -index 6cb82420b..592fcd538 100644 +index 6cb82420b4..592fcd538a 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -1,6 +1,7 @@ @@ -115,7 +115,7 @@ index 6cb82420b..592fcd538 100644 world.a(blockposition, false); } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 138e2ea56..6a4ccaeb0 100644 +index 138e2ea56a..6a4ccaeb0f 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; diff --git a/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch b/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch index 47695d9c4..f55001b6a 100644 --- a/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch +++ b/Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch @@ -1,4 +1,4 @@ -From 9c0c887a6afa42eabf0c85e15d32c8e3009bbd60 Mon Sep 17 00:00:00 2001 +From 616c1a4d73f502e9274d5a9598ee92d5a0cd329a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 29 Jul 2018 05:02:15 +0100 Subject: [PATCH] Break up and make tab spam limits configurable @@ -22,7 +22,7 @@ to take the burden of this into their own hand without having to rely on plugins doing unsafe things. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 26ab855dc..adef07d4d 100644 +index 26ab855dcf..adef07d4d5 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -287,4 +287,18 @@ public class PaperConfig { @@ -45,7 +45,7 @@ index 26ab855dc..adef07d4d 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 8648845ac..6627d8402 100644 +index 8648845acb..6627d8402f 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch b/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch index be2e08fc2..7425b7402 100644 --- a/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch +++ b/Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch @@ -1,11 +1,11 @@ -From af01ef90f1b7dad0af7a9da89c74fd3403a86807 Mon Sep 17 00:00:00 2001 +From 92f9b971217b4956efdf05ceb465d9c7340cae18 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 2 Aug 2018 08:44:35 -0500 Subject: [PATCH] Add hand to bucket events diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java -index 6e385b530..2c8bbf20a 100644 +index 6e385b5304..2c8bbf20ae 100644 --- a/src/main/java/net/minecraft/server/EntityCow.java +++ b/src/main/java/net/minecraft/server/EntityCow.java @@ -61,7 +61,7 @@ public class EntityCow extends EntityAnimal { @@ -18,7 +18,7 @@ index 6e385b530..2c8bbf20a 100644 if (event.isCancelled()) { return false; diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java -index 7c5c04984..ffe4b9eb8 100644 +index 7c5c049843..ffe4b9eb86 100644 --- a/src/main/java/net/minecraft/server/ItemBucket.java +++ b/src/main/java/net/minecraft/server/ItemBucket.java @@ -41,7 +41,7 @@ public class ItemBucket extends Item { @@ -69,7 +69,7 @@ index 7c5c04984..ffe4b9eb8 100644 ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 317a5bf4e..f006b441a 100644 +index 317a5bf4ef..f006b441ad 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -373,6 +373,20 @@ public class CraftEventFactory { diff --git a/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch b/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch index 65e5c3c03..b0e4ac8e3 100644 --- a/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch +++ b/Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch @@ -1,11 +1,11 @@ -From 64d59282e1f9063daca2a22e2fe2b4ae90155a8f Mon Sep 17 00:00:00 2001 +From 83d34d895d415d49ae79fffb773502ee2c61192d Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 3 Aug 2018 00:04:54 -0400 Subject: [PATCH] MC-135506: Experience should save as Integers diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java -index 87c6b77ce..53c6c3389 100644 +index 87c6b77ce3..53c6c33892 100644 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java @@ -207,7 +207,7 @@ public class EntityExperienceOrb extends Entity { diff --git a/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch b/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch index 3ca2459b1..1c89a3dd9 100644 --- a/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch +++ b/Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch @@ -1,4 +1,4 @@ -From 3b8f8252fd955b3f1d7a9f3315fee47c8e9693a7 Mon Sep 17 00:00:00 2001 +From 82671363bc4c58aba1d8e858d9d3e45a4d54d99c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Nov 2016 00:40:42 -0500 Subject: [PATCH] Fix client rendering skulls from same user @@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user, for when different skins were used when skull was made. diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 641a52b96..0b0c3c681 100644 +index 641a52b968..0b0c3c681c 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -54,7 +54,7 @@ public final class ItemStack { @@ -25,7 +25,7 @@ index 641a52b96..0b0c3c681 100644 private EntityItemFrame i; private ShapeDetectorBlock j; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index d9574a9ac..93ae6dcd7 100644 +index d9574a9ace..93ae6dcd78 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -253,6 +253,15 @@ public class PacketDataSerializer extends ByteBuf { @@ -62,7 +62,7 @@ index d9574a9ac..93ae6dcd7 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 3a1d0deb0..1fcbbd698 100644 +index 3a1d0deb0d..1fcbbd698a 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -58,6 +58,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -74,7 +74,7 @@ index 3a1d0deb0..1fcbbd698 100644 this.g.add(nbttagcompound); } diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java -index 177cceb77..0882d82ce 100644 +index 177cceb77f..0882d82cef 100644 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa diff --git a/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch index ae10fb913..d188fd665 100644 --- a/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0272-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From 6f1b4d5dedcc6c6d5d557cf3d1672bcfbfdad4f8 Mon Sep 17 00:00:00 2001 +From 2c9bd68d76c1e49ab6325805eb74c4ffdb03d408 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Wed, 8 Aug 2018 15:30:52 -0400 Subject: [PATCH] Add Early Warning Feature to WatchDog @@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index adef07d4d..214b577b3 100644 +index adef07d4d5..214b577b32 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -24,6 +24,7 @@ import org.bukkit.configuration.file.YamlConfiguration; @@ -36,7 +36,7 @@ index adef07d4d..214b577b3 100644 public static int tabSpamLimit = 500; private static void tabSpamLimiters() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 7c268eb54..9e5fe9794 100644 +index 7c268eb543..9e5fe97947 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -870,6 +870,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 10 Aug 2018 22:11:49 -0400 Subject: [PATCH] Make EnderDragon implement Mob diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java -index cc115cc36..4947249da 100644 +index cc115cc368..4947249da2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftComplexLivingEntity.java @@ -1,17 +1,18 @@ diff --git a/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch b/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch index 8491839b6..dd7fc6f9e 100644 --- a/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch +++ b/Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch @@ -1,4 +1,4 @@ -From d1c9e47e37c5d29417002931231e8d2659fee1c5 Mon Sep 17 00:00:00 2001 +From 6ab48e593321679760a30c18cd39fc513e68d0f9 Mon Sep 17 00:00:00 2001 From: egg82 Date: Tue, 7 Aug 2018 01:24:23 -0600 Subject: [PATCH] Use ConcurrentHashMap in JsonList @@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp Finally, added a couple obfhelpers for the modified code diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 734e7ecf6..8570e38f4 100644 +index 734e7ecf63..8570e38f42 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -35,7 +35,8 @@ public class JsonList> { diff --git a/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch b/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch index a5cc7434c..4bb89c2b0 100644 --- a/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch +++ b/Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch @@ -1,4 +1,4 @@ -From f843bf9620847c2e3752de8a863b48a16a707571 Mon Sep 17 00:00:00 2001 +From 5b5eae01e944b6381ce8b0b2e1171b8db52d21d0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 12 Aug 2018 02:33:39 -0400 Subject: [PATCH] Use a Queue for Queueing Commands @@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands Lists are bad as Queues mmmkay. diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index ec257ba31..349a0ea21 100644 +index ec257ba31f..349a0ea213 100644 --- a/src/main/java/net/minecraft/server/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/DedicatedServer.java @@ -44,7 +44,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer diff --git a/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch index 5f90b581a..457bc9515 100644 --- a/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch +++ b/Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch @@ -1,11 +1,11 @@ -From aba7ad835af0314f275d0bfac6bc14f14d531a75 Mon Sep 17 00:00:00 2001 +From 3857606d6edee62ac7bd5527964aabfa335a94eb Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 15 Aug 2018 01:16:34 -0400 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 299523799..91f2066b1 100644 +index 2995237994..91f2066b12 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -127,9 +127,16 @@ public class CraftChunk implements Chunk { diff --git a/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch index 0dc242a95..35548c438 100644 --- a/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch +++ b/Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch @@ -1,11 +1,11 @@ -From 87b77cad98f830c2bafe7b8e16e2c98094796c06 Mon Sep 17 00:00:00 2001 +From bdb8fea3be1eb50e8eb8d4d2fbc52c447133912d Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 15 Aug 2018 01:26:09 -0700 Subject: [PATCH] Allow disabling armour stand ticking diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index eaaa51e4b..bc3df01aa 100644 +index eaaa51e4bf..bc3df01aab 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -393,4 +393,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index eaaa51e4b..bc3df01aa 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java -index 61d7d507a..42b9a339e 100644 +index 61d7d507aa..42b9a339e9 100644 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java @@ -44,6 +44,12 @@ public class EntityArmorStand extends EntityLiving { @@ -142,7 +142,7 @@ index 61d7d507a..42b9a339e 100644 public Vector3f r() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index fea821be1..0b84ead5f 100644 +index fea821be1c..0b84ead5f2 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2326,52 +2326,7 @@ public abstract class EntityLiving extends Entity { @@ -256,7 +256,7 @@ index fea821be1..0b84ead5f 100644 float f2 = MathHelper.g(f - this.aI); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java -index d1d689e5d..ac105270d 100644 +index d1d689e5d7..ac105270d5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java @@ -297,5 +297,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand { diff --git a/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch b/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch index a239e15b1..a124b9561 100644 --- a/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch +++ b/Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch @@ -1,4 +1,4 @@ -From 6c4b570924752e5bab437614cf2b0755bed0a1ff Mon Sep 17 00:00:00 2001 +From 67b0feff4e6eee9190683b4ddff17cbd348930ad Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Wed, 15 Aug 2018 12:05:12 -0700 Subject: [PATCH] Optimize BlockPosition helper methods @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods Resolves #1338 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java -index e9ea232a7..e76528f19 100644 +index e9ea232a78..e76528f199 100644 --- a/src/main/java/net/minecraft/server/BlockPosition.java +++ b/src/main/java/net/minecraft/server/BlockPosition.java @@ -134,57 +134,74 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali diff --git a/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch b/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch index 6b6e149f6..dc8b4ada7 100644 --- a/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch +++ b/Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch @@ -1,4 +1,4 @@ -From 6591167e389c3cef67b3ba8c1c255bfd77081b2e Mon Sep 17 00:00:00 2001 +From be762fa13b5569eac6f06b15842bfc42526004e8 Mon Sep 17 00:00:00 2001 From: Mystiflow Date: Fri, 6 Jul 2018 13:21:30 +0100 Subject: [PATCH] Send nearby packets from world player list not server list @@ -81,5 +81,5 @@ index e94ac028df..d61769b4f2 100644 private static Map> gamerules; -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch b/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch index 4e22a4d54..d5901e66e 100644 --- a/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch +++ b/Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch @@ -1,11 +1,11 @@ -From a485890b51d7dd81b18da68b6039681d20e34dc2 Mon Sep 17 00:00:00 2001 +From c911b88a291cef7dc60a6d192a00a7931fbf92df Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 18 Aug 2018 12:43:16 -0400 Subject: [PATCH] Restore vanlla default mob-spawn-range diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 4965a48c3..58767972a 100644 +index 4965a48c30..58767972a3 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java @@ -165,7 +165,7 @@ public class SpigotWorldConfig diff --git a/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch b/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch index 515cb0112..1aa61f40c 100644 --- a/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch +++ b/Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch @@ -1,4 +1,4 @@ -From ff43a33658c40c998527521c00d78e1f3908c7bd Mon Sep 17 00:00:00 2001 +From f19d7150bb322b5d488224876504e75d2d552a32 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Thu, 23 Aug 2018 11:45:32 -0400 Subject: [PATCH] Optimize CraftBlockData Creation @@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData and cloning it when one is needed. diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index 9ab57be85..c1ff62aa5 100644 +index 9ab57be850..c1ff62aa52 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap; @@ -36,7 +36,7 @@ index 9ab57be85..c1ff62aa5 100644 return this.getBlock().k(this); } diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java -index 683b17a0c..a0746a169 100644 +index 683b17a0c9..a0746a1694 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java @@ -549,7 +549,17 @@ public class CraftBlockData implements BlockData { diff --git a/Spigot-Server-Patches/0282-Fix-MC-124320.patch b/Spigot-Server-Patches/0282-Fix-MC-124320.patch index fcafe2633..4dc9d580a 100644 --- a/Spigot-Server-Patches/0282-Fix-MC-124320.patch +++ b/Spigot-Server-Patches/0282-Fix-MC-124320.patch @@ -1,11 +1,11 @@ -From 44b4978b2f2c21267dcc18515c9c986c711c9150 Mon Sep 17 00:00:00 2001 +From f8f9db78567e05bcfddf53d78eace9c68e264f06 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Thu, 23 Aug 2018 09:25:30 -0500 Subject: [PATCH] Fix MC-124320 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index 5f261b9b9..b9b750c36 100644 +index 5f261b9b92..b9b750c369 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -170,6 +170,7 @@ public class Block implements IMaterial { @@ -17,7 +17,7 @@ index 5f261b9b9..b9b750c36 100644 IBlockData iblockdata1 = iblockdata; BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index b7c67f0cd..d86f76f30 100644 +index b7c67f0cdb..d86f76f30b 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -354,8 +354,9 @@ public class EntityEnderman extends EntityMonster { diff --git a/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch b/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch index ee3ba35ec..fb73644b9 100644 --- a/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch +++ b/Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch @@ -1,11 +1,11 @@ -From 9d78806cb95ad358b096de75396d79a09e624e2d Mon Sep 17 00:00:00 2001 +From 028e81f39e8dba06b7545dd3e1ca2f03f418fd1d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 08:18:42 -0500 Subject: [PATCH] Slime Pathfinder Events diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java -index 3ecf73219..2efc18df9 100644 +index 3ecf732192..2efc18df94 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -3,6 +3,14 @@ package net.minecraft.server; @@ -147,7 +147,7 @@ index 3ecf73219..2efc18df9 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java -index ce6ed6e89..6e9f1b66d 100644 +index ce6ed6e890..6e9f1b66df 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSlime.java @@ -35,4 +35,14 @@ public class CraftSlime extends CraftMob implements Slime { diff --git a/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch b/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch index 6fc273e09..a31f010a0 100644 --- a/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch +++ b/Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch @@ -1,11 +1,11 @@ -From 56b1bf3608cef2c0324805e96628badabb82e420 Mon Sep 17 00:00:00 2001 +From 48b10e7eb503408b8f63ec9e868350e216aae173 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 8 Aug 2018 16:33:21 -0600 Subject: [PATCH] Configurable speed for water flowing over lava diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index bc3df01aa..487b0d5cd 100644 +index bc3df01aab..487b0d5cd6 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -399,4 +399,10 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index bc3df01aa..487b0d5cd 100644 + } } diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java -index f56e14e1e..6d351f097 100644 +index f56e14e1e2..6d351f0979 100644 --- a/src/main/java/net/minecraft/server/BlockFluids.java +++ b/src/main/java/net/minecraft/server/BlockFluids.java @@ -70,11 +70,28 @@ public class BlockFluids extends Block implements IFluidSource { diff --git a/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch b/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch index 99a3c0236..1af9119c1 100644 --- a/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch +++ b/Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch @@ -1,4 +1,4 @@ -From fa26bac76e8d9a8d2e42958564faf5613d324084 Mon Sep 17 00:00:00 2001 +From 8bbb89f0b32b1a529635883cffb52fb70625ee8f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 26 Aug 2018 20:49:50 -0400 Subject: [PATCH] Optimize RegistryMaterials @@ -8,7 +8,7 @@ Use larger initial sizes to increase bucket capacity on the BiMap BiMap.get was seen to be using a good bit of CPU time. diff --git a/src/main/java/net/minecraft/server/RegistryMaterials.java b/src/main/java/net/minecraft/server/RegistryMaterials.java -index 2d6a7b3a4..8477febca 100644 +index 2d6a7b3a47..8477febca2 100644 --- a/src/main/java/net/minecraft/server/RegistryMaterials.java +++ b/src/main/java/net/minecraft/server/RegistryMaterials.java @@ -16,8 +16,8 @@ import org.apache.logging.log4j.Logger; diff --git a/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch b/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch index 54ab4da02..3dba6c439 100644 --- a/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch +++ b/Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch @@ -1,11 +1,11 @@ -From b545162dc8015f80b7e162de86d032856d029d2a Mon Sep 17 00:00:00 2001 +From cb51204c355b37eae0d0820cc85acb9fa7b11467 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Aug 2018 19:56:51 -0500 Subject: [PATCH] Add PhantomPreSpawnEvent diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index b62a8227b..82323bf4a 100644 +index b62a8227b2..82323bf4ac 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -130,6 +130,11 @@ public class EntityPhantom extends EntityFlying implements IMonster { @@ -48,7 +48,7 @@ index b62a8227b..82323bf4a 100644 private final PathfinderTargetCondition b; diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java -index add566ea4..f488c22ed 100644 +index add566ea4f..f488c22ed6 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java @@ -52,8 +52,17 @@ public class MobSpawnerPhantom { @@ -71,7 +71,7 @@ index add566ea4..f488c22ed 100644 groupdataentity = entityphantom.prepare(worldserver, difficultydamagescaler, EnumMobSpawn.NATURAL, groupdataentity, (NBTTagCompound) null); worldserver.addEntity(entityphantom, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL); // CraftBukkit diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java -index 9f9ee9239..2b9731369 100644 +index 9f9ee92390..2b97313694 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java @@ -35,4 +35,10 @@ public class CraftPhantom extends CraftFlying implements Phantom { diff --git a/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch b/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch index 5e2588af4..3470f77fc 100644 --- a/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch +++ b/Spigot-Server-Patches/0287-Add-More-Creeper-API.patch @@ -1,11 +1,11 @@ -From 5ac23948fb65632ebb4b47e95cd268d6552fb425 Mon Sep 17 00:00:00 2001 +From 48c2bb78cc29f4da95824f400bcdfd333994466b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 24 Aug 2018 11:50:26 -0500 Subject: [PATCH] Add More Creeper API diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java -index b89530079..45dfc8104 100644 +index b895300797..45dfc8104a 100644 --- a/src/main/java/net/minecraft/server/EntityCreeper.java +++ b/src/main/java/net/minecraft/server/EntityCreeper.java @@ -14,7 +14,7 @@ public class EntityCreeper extends EntityMonster { @@ -38,7 +38,7 @@ index b89530079..45dfc8104 100644 public boolean canCauseHeadDrop() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java -index 896405148..075a5e77e 100644 +index 896405148c..075a5e77e2 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftCreeper.java @@ -88,4 +88,18 @@ public class CraftCreeper extends CraftMonster implements Creeper { diff --git a/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch b/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch index e8ef21c85..c13511b41 100644 --- a/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch +++ b/Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch @@ -1,11 +1,11 @@ -From 1ac398b35579dd8be181195d6646a8dc4a3fb2b8 Mon Sep 17 00:00:00 2001 +From c54f91cb3681cd81ef89544504730fa65bb5eb7e Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 28 Aug 2018 23:04:15 -0400 Subject: [PATCH] Inventory#removeItemAnySlot diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java -index 0d637e207..026a0c399 100644 +index 0d637e207e..026a0c3995 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -223,10 +223,16 @@ public class CraftInventory implements Inventory { diff --git a/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch b/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch index 3aa3d4905..a845cfc90 100644 --- a/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch +++ b/Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch @@ -1,4 +1,4 @@ -From fcc30f0d55b5b89b772030d90d81db5823001c6f Mon Sep 17 00:00:00 2001 +From 523bdbc83ec8dc203433f72bbd67ce75c186a262 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 2 Sep 2018 19:34:33 -0700 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted @@ -19,5 +19,5 @@ index d61769b4f2..6e1ae94cea 100644 // If generate = false, but the chunk already exists, we will get this back. if (chunk instanceof ProtoChunkExtension) { -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch b/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch index 1a816062e..5eb0b7800 100644 --- a/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch @@ -1,11 +1,11 @@ -From d7f1f91234c64c346a8370b929ec2b329eeaeb5b Mon Sep 17 00:00:00 2001 +From e4d0ccbc0c6b7d1738314e6c8404ec56d7f7ddbd Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Mon, 3 Sep 2018 18:20:03 -0500 Subject: [PATCH] Add ray tracing methods to LivingEntity diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 0b84ead5f..fa097e055 100644 +index 0b84ead5f2..fa097e0551 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -3254,6 +3254,23 @@ public abstract class EntityLiving extends Entity { @@ -33,7 +33,7 @@ index 0b84ead5f..fa097e055 100644 public int getShieldBlockingDelay() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 02346f1c5..d197094f5 100644 +index 02346f1c50..d197094f54 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -196,6 +196,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch index 178073a13..d2ccfce07 100644 --- a/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch @@ -1,11 +1,11 @@ -From 007fe854bd38c938febf2296f1a64997bec74314 Mon Sep 17 00:00:00 2001 +From 6a81dc0fc0d954e1d084457b95c240e00e2dad04 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:02:00 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 36748ccb7..308ac18f7 100644 +index 36748ccb73..308ac18f7e 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -2123,14 +2123,17 @@ public abstract class EntityHuman extends EntityLiving { @@ -27,7 +27,7 @@ index 36748ccb7..308ac18f7 100644 this.aB = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index d7d86a8b2..d584c76ec 100644 +index d7d86a8b24..d584c76ecd 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1940,6 +1940,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0292-Improve-death-events.patch b/Spigot-Server-Patches/0292-Improve-death-events.patch index 789baae3b..65b0b1045 100644 --- a/Spigot-Server-Patches/0292-Improve-death-events.patch +++ b/Spigot-Server-Patches/0292-Improve-death-events.patch @@ -1,4 +1,4 @@ -From 622f34981a35d0d5b89d14afd0289cc6e50ecb00 Mon Sep 17 00:00:00 2001 +From 78532959f99d1addbae3326a50a0db8f333e989f Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Tue, 21 Aug 2018 01:39:35 +0100 Subject: [PATCH] Improve death events diff --git a/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch b/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch index 63fff7f26..210e7a8bc 100644 --- a/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch +++ b/Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch @@ -1,11 +1,11 @@ -From 3e077f1bf8f2c01f9dea36dbfbdb39e81ed161c2 Mon Sep 17 00:00:00 2001 +From 04bb3f2b694c437495e3ffec8af2679964f1484f Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Sep 2018 18:43:31 -0500 Subject: [PATCH] Allow chests to be placed with NBT data diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index 0b0c3c681..d953cdef1 100644 +index 0b0c3c681c..d953cdef14 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -240,6 +240,7 @@ public final class ItemStack { @@ -17,7 +17,7 @@ index 0b0c3c681..d953cdef1 100644 for (BlockState blockstate : blocks) { blockstate.update(true, false); diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java -index c4766f729..b22bd06e2 100644 +index c4766f729f..b22bd06e27 100644 --- a/src/main/java/net/minecraft/server/TileEntityChest.java +++ b/src/main/java/net/minecraft/server/TileEntityChest.java @@ -292,7 +292,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic diff --git a/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch b/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch index a4a6e3a15..25524dd73 100644 --- a/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch +++ b/Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch @@ -1,4 +1,4 @@ -From 34442249275444961016441d3496362c4c48cadd Mon Sep 17 00:00:00 2001 +From 95b1d64ff38307c80fb25b6f813466ffde17bd68 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 9 Sep 2018 13:30:00 -0400 Subject: [PATCH] Mob Pathfinding API @@ -7,7 +7,7 @@ Implements Pathfinding API for mobs diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java new file mode 100644 -index 000000000..f68a07cb9 +index 0000000000..f68a07cb96 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java @@ -0,0 +1,111 @@ @@ -123,7 +123,7 @@ index 000000000..f68a07cb9 + } +} diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java -index bdd092e49..f06764973 100644 +index bdd092e49d..f06764973f 100644 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java @@ -80,7 +80,7 @@ public abstract class NavigationAbstract { @@ -170,7 +170,7 @@ index bdd092e49..f06764973 100644 this.c = null; } diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java -index 312352ef8..dcb4e2508 100644 +index 312352ef84..dcb4e25080 100644 --- a/src/main/java/net/minecraft/server/PathEntity.java +++ b/src/main/java/net/minecraft/server/PathEntity.java @@ -5,13 +5,14 @@ import javax.annotation.Nullable; @@ -210,7 +210,7 @@ index 312352ef8..dcb4e2508 100644 return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c); diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java -index b1db95daa..18cdd2a6f 100644 +index b1db95daa9..18cdd2a6f2 100644 --- a/src/main/java/net/minecraft/server/PathPoint.java +++ b/src/main/java/net/minecraft/server/PathPoint.java @@ -2,9 +2,9 @@ package net.minecraft.server; @@ -227,7 +227,7 @@ index b1db95daa..18cdd2a6f 100644 public int d = -1; public float e; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java -index 90e63fbf2..c89bc7024 100644 +index 90e63fbf29..c89bc7024b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable; diff --git a/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch b/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch index f86d722dd..80d72fef8 100644 --- a/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch +++ b/Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch @@ -1,11 +1,11 @@ -From 3c964129094fed21fa99aed9111584300e583f93 Mon Sep 17 00:00:00 2001 +From 9c33f37c35626da82ad4810afee694f7a6512d81 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:36:16 -0400 Subject: [PATCH] Prevent chunk loading from Fluid Flowing diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java -index 3099a5e65..376dca188 100644 +index 3099a5e654..376dca1889 100644 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java @@ -178,7 +178,8 @@ public abstract class FluidTypeFlowing extends FluidType { diff --git a/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index d908dedf6..506cc5479 100644 --- a/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,11 +1,11 @@ -From d2072c82ded4da97259e387eb5006d7390169ad0 Mon Sep 17 00:00:00 2001 +From 0c6ead87f10abf0b7bb5e23c1a77a315db6cc7b4 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:55 +0300 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java -index 005ebec26..97d85f845 100644 +index 005ebec266..97d85f8451 100644 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java @@ -43,7 +43,7 @@ public class ArgumentBlock { @@ -32,7 +32,7 @@ index 005ebec26..97d85f845 100644 this.s = this::l; if (this.i.canRead() && this.i.peek() == '#') { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 0682c6e85..cdd262d86 100644 +index 0682c6e859..cdd262d86c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -87,6 +87,12 @@ import org.bukkit.persistence.PersistentDataContainer; diff --git a/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch b/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch index b7e5014ec..ab153963d 100644 --- a/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch +++ b/Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch @@ -1,11 +1,11 @@ -From c78da171571b4c501b074da90f332bd2cfd04617 Mon Sep 17 00:00:00 2001 +From 9e440f52edf791ae1293f568237a20aae50f998d Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 10 Sep 2018 23:56:36 -0400 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java -index bf8ca9b32..7ccb3d5c0 100644 +index bf8ca9b32a..7ccb3d5c06 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget { @@ -52,7 +52,7 @@ index bf8ca9b32..7ccb3d5c0 100644 return ichunkaccess == null ? false : ichunkaccess.getType(blockposition).getBlock() == this.g && ichunkaccess.getType(blockposition.up()).isAir() && ichunkaccess.getType(blockposition.up(2)).isAir(); } diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java -index d4cd50918..d6a3b9933 100644 +index d4cd50918b..d6a3b99339 100644 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java @@ -109,6 +109,7 @@ public class RandomPositionGenerator { diff --git a/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch b/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch index 2e82e9172..0ae71e339 100644 --- a/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch +++ b/Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch @@ -1,4 +1,4 @@ -From c477f5ca9e218c211b69584171d6193f71e8062c Mon Sep 17 00:00:00 2001 +From ff844cab72c6f166b921da1773b942ede16dab47 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:12:57 -0400 Subject: [PATCH] Prevent mob spawning from loading/generating chunks @@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks also prevents if out of world border bounds diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java -index 224443e03..fdac5bb3a 100644 +index 224443e03c..fdac5bb3a2 100644 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -25,9 +25,9 @@ public final class SpawnerCreature { diff --git a/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch index eee9c26a2..b88b6a845 100644 --- a/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch +++ b/Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch @@ -1,4 +1,4 @@ -From 25c89be5d3c5ac036b8725db797a95b163b7275a Mon Sep 17 00:00:00 2001 +From cc3a409afd2873bb3f2d588ff235b7625691cd34 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 12 Sep 2018 21:47:01 -0400 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning Uses an EnumMap as well as a Set paired List for O(1) contains calls. diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java -index 253890e53..0102a170d 100644 +index 253890e537..0102a170dc 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/src/main/java/net/minecraft/server/BiomeBase.java @@ -40,7 +40,7 @@ public abstract class BiomeBase { diff --git a/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch b/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch index 44bab8e98..89cd85101 100644 --- a/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch +++ b/Spigot-Server-Patches/0300-Implement-furnace-cook-speed-multiplier-API.patch @@ -1,4 +1,4 @@ -From 5e77ee0ecdf1572e88759c5122e315da8cf830f4 Mon Sep 17 00:00:00 2001 +From 88cb06b8d501c297c00efe89140f24caadc3aaed Mon Sep 17 00:00:00 2001 From: Tassu Date: Thu, 13 Sep 2018 08:45:21 +0300 Subject: [PATCH] Implement furnace cook speed multiplier API @@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API Signed-off-by: Tassu diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java -index 560e2f42b..d5432bfeb 100644 +index 560e2f42b7..d5432bfeb7 100644 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java @@ -8,6 +8,7 @@ import java.util.Map; @@ -57,7 +57,7 @@ index 560e2f42b..d5432bfeb 100644 this.cookTimeTotal = this.getRecipeCookingTime(); this.burn(irecipe); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java -index 9cc67915c..1ce10ea04 100644 +index 9cc67915ca..1ce10ea049 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java @@ -63,4 +63,18 @@ public class CraftFurnace extends CraftContainer diff --git a/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch b/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch index a9d0f7632..212f3de49 100644 --- a/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch +++ b/Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch @@ -1,4 +1,4 @@ -From 21398dff09048bae64ad0de46e3b26d3436291a2 Mon Sep 17 00:00:00 2001 +From de69a052afbc2390ff58f9b67148837bd757d72f Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:05:31 -0400 Subject: [PATCH] Support Overriding World Seeds @@ -15,7 +15,7 @@ This seed will end up being saved to the world data file, so it is a permanent change in that it won't go back if you remove it from paper.yml diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 214b577b3..559e6b42b 100644 +index 214b577b32..559e6b42ba 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -11,6 +11,7 @@ import java.lang.reflect.Modifier; @@ -59,7 +59,7 @@ index 214b577b3..559e6b42b 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 9e5fe9794..52ec526fc 100644 +index 9e5fe97947..52ec526fc6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -378,7 +378,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 17 Sep 2018 23:37:31 -0400 Subject: [PATCH] Optimize Server World Map @@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java new file mode 100644 -index 000000000..6bb2f98b4 +index 0000000000..6bb2f98b45 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java @@ -0,0 +1,191 @@ @@ -217,7 +217,7 @@ index 000000000..6bb2f98b4 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 52ec526fc..a3156d003 100644 +index 52ec526fc6..a3156d0034 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -88,7 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 18 Sep 2018 23:53:23 +0100 Subject: [PATCH] PreSpawnerSpawnEvent @@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for spawners. diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 43c491f71..cb7cb789b 100644 +index 43c491f71b..cb7cb789b8 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -111,11 +111,11 @@ public abstract class MobSpawnerAbstract { diff --git a/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch b/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch index 8ff87bc2c..766c41aef 100644 --- a/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch +++ b/Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch @@ -1,4 +1,4 @@ -From 2b591a0751b7e16a64bbf60b252bd40ec6bfaec7 Mon Sep 17 00:00:00 2001 +From 7e783e91153c239146ee984badea0c033ea615a2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 22 Sep 2018 15:56:59 -0400 Subject: [PATCH] Catch JsonParseException in Entity and TE names @@ -26,7 +26,7 @@ index 7867122974..ef2a496eda 100644 if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) { diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index e8b70a5ca5..9a23380600 100644 +index fd78f647eb..1e3e541c8b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -1679,7 +1679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch b/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch index 79b8460dc..c3389a1d4 100644 --- a/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch +++ b/Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch @@ -1,4 +1,4 @@ -From bdd8538f1464d27e07f46d9c5e98c225b4eee934 Mon Sep 17 00:00:00 2001 +From ad93ef8902abf87b5cd3b70f55807599c8ffdfed Mon Sep 17 00:00:00 2001 From: Brokkonaut Date: Tue, 25 Sep 2018 06:53:43 +0200 Subject: [PATCH] Avoid dimension id collisions @@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was unloaded before. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f36b64246..4289d029c 100644 +index f36b642466..4289d029c2 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1001,7 +1001,7 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch b/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch index fdd914054..26efcb486 100644 --- a/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch +++ b/Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch @@ -1,11 +1,11 @@ -From 3bb8ed8325e88e461ca22e78eb5f211948bdc4a6 Mon Sep 17 00:00:00 2001 +From d5a58173728d826ac19eb1150ef13424b1165147 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 23 Sep 2018 20:59:53 -0500 Subject: [PATCH] Honor EntityAgeable.ageLock diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java -index cec938436..3d27f0964 100644 +index cec938436d..3d27f0964a 100644 --- a/src/main/java/net/minecraft/server/EntityAgeable.java +++ b/src/main/java/net/minecraft/server/EntityAgeable.java @@ -101,6 +101,7 @@ public abstract class EntityAgeable extends EntityCreature { diff --git a/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch b/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch index cc29f8d12..4aa4c066f 100644 --- a/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch +++ b/Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch @@ -1,11 +1,11 @@ -From 93f743c597f7213554bda4827159d3dab780f5fa Mon Sep 17 00:00:00 2001 +From e7407ee9e0e00f9709317d36e552a2fe988bfa53 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 2 Oct 2018 09:57:50 +0100 Subject: [PATCH] Configurable connection throttle kick message diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 559e6b42b..092bff78a 100644 +index 559e6b42ba..092bff78ab 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -274,6 +274,11 @@ public class PaperConfig { @@ -21,7 +21,7 @@ index 559e6b42b..092bff78a 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java -index 8928d93e4..0532f975b 100644 +index 8928d93e49..0532f975b7 100644 --- a/src/main/java/net/minecraft/server/HandshakeListener.java +++ b/src/main/java/net/minecraft/server/HandshakeListener.java @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener { diff --git a/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch index f2885223d..4efcc8106 100644 --- a/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch +++ b/Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch @@ -1,4 +1,4 @@ -From f17840fb1a9ed8fc2f6ce92405290068e258d44f Mon Sep 17 00:00:00 2001 +From 5238949ad78e91f119b0e1d78a4951194a67ca96 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 3 Oct 2018 20:09:18 -0400 Subject: [PATCH] Hook into CB plugin rewrites @@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're debugging in an IDE pre-relocate. diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java -index 2d334a594..79c9489c0 100644 +index 2d334a5944..79c9489c09 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -6,7 +6,9 @@ import java.io.FileOutputStream; diff --git a/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch b/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch index b989dfa7a..1ae889754 100644 --- a/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch +++ b/Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch @@ -1,11 +1,11 @@ -From d5eb1130ffd33d83a7824f1d964323a5c64cd7ef Mon Sep 17 00:00:00 2001 +From 55c94c32765cc11e78fac1e0bf531a91e3e81d65 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 21:47:44 -0500 Subject: [PATCH] Allow setting the vex's summoner diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java -index a46730460..cf274666c 100644 +index a46730460e..cf274666c7 100644 --- a/src/main/java/net/minecraft/server/EntityVex.java +++ b/src/main/java/net/minecraft/server/EntityVex.java @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster { @@ -17,7 +17,7 @@ index a46730460..cf274666c 100644 this.c = entityinsentient; } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java -index 169c951ec..2f7df3074 100644 +index 169c951ec3..2f7df3074f 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex { diff --git a/Spigot-Server-Patches/0310-Add-sun-related-API.patch b/Spigot-Server-Patches/0310-Add-sun-related-API.patch index b849eeb13..4ecf79284 100644 --- a/Spigot-Server-Patches/0310-Add-sun-related-API.patch +++ b/Spigot-Server-Patches/0310-Add-sun-related-API.patch @@ -1,4 +1,4 @@ -From 3e5915a5ebe9224483503e023e4fb220b46a34b6 Mon Sep 17 00:00:00 2001 +From 9d32a271041db2a4754d38f9966c678924995b07 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 00:54:21 -0500 Subject: [PATCH] Add sun related API @@ -51,5 +51,5 @@ index c89bc7024b..eaad222fd3 100644 + // Paper end } -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch b/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch index b7e85f768..4d66c671c 100644 --- a/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch +++ b/Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch @@ -1,11 +1,11 @@ -From b36c012db5e35944fda342922b97e70304ae5371 Mon Sep 17 00:00:00 2001 +From 7bace2287242102008345548aaf3f2a5a09a3d3b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 10 Oct 2018 21:22:44 -0500 Subject: [PATCH] Check Drowned for Villager Aggression Config diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java -index 70c06ca77..77885f67f 100644 +index 70c06ca775..77885f67ff 100644 --- a/src/main/java/net/minecraft/server/EntityDrowned.java +++ b/src/main/java/net/minecraft/server/EntityDrowned.java @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity { diff --git a/Spigot-Server-Patches/0312-Here-s-Johnny.patch b/Spigot-Server-Patches/0312-Here-s-Johnny.patch index 22fbc3896..cd5ed161e 100644 --- a/Spigot-Server-Patches/0312-Here-s-Johnny.patch +++ b/Spigot-Server-Patches/0312-Here-s-Johnny.patch @@ -1,11 +1,11 @@ -From 7d691218ef28e137e708cf79fb91e24e628da53d Mon Sep 17 00:00:00 2001 +From 011777340f55c95aba2000abd9a90f8db31e3193 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 12 Oct 2018 01:37:22 -0500 Subject: [PATCH] Here's Johnny! diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java -index 73ecdd22e..c974c02e9 100644 +index 73ecdd22ea..c974c02e92 100644 --- a/src/main/java/net/minecraft/server/EntityVindicator.java +++ b/src/main/java/net/minecraft/server/EntityVindicator.java @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract { @@ -18,7 +18,7 @@ index 73ecdd22e..c974c02e9 100644 public EntityVindicator(EntityTypes entitytypes, World world) { super(entitytypes, world); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java -index 951d47929..5ff957ced 100644 +index 951d479298..5ff957ced7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator { diff --git a/Spigot-Server-Patches/0313-Turtle-API.patch b/Spigot-Server-Patches/0313-Turtle-API.patch index 479a9133f..a3c0c7865 100644 --- a/Spigot-Server-Patches/0313-Turtle-API.patch +++ b/Spigot-Server-Patches/0313-Turtle-API.patch @@ -1,11 +1,11 @@ -From e5fe16d5ec0b517fbc1143aa49cb4fdfc61fc5ae Mon Sep 17 00:00:00 2001 +From 12f979440f824e4a17a24f115ae4d06f024f4c07 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 29 Sep 2018 16:08:23 -0500 Subject: [PATCH] Turtle API diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java -index 76296119a..dd02cb348 100644 +index 76296119a1..dd02cb3485 100644 --- a/src/main/java/net/minecraft/server/EntityTurtle.java +++ b/src/main/java/net/minecraft/server/EntityTurtle.java @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal { @@ -103,7 +103,7 @@ index 76296119a..dd02cb348 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java -index 123a2c75c..8edcf7af6 100644 +index 123a2c75ca..8edcf7af65 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java @@ -1,6 +1,8 @@ diff --git a/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch b/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch index f40d2ceb4..53994ce64 100644 --- a/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch +++ b/Spigot-Server-Patches/0314-Limit-lightning-strike-effect-distance.patch @@ -1,4 +1,4 @@ -From 92015b1945e22b466eb815d61255412792c654f3 Mon Sep 17 00:00:00 2001 +From 79d4abf1d8eda7376c97f073e70b15fc58b8efa4 Mon Sep 17 00:00:00 2001 From: Trigary Date: Fri, 14 Sep 2018 17:42:08 +0200 Subject: [PATCH] Limit lightning strike effect distance @@ -82,5 +82,5 @@ index 2b2b547034..7364f48210 100644 @Override -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch b/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch index 8f3fd8742..726898a4d 100644 --- a/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch +++ b/Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch @@ -1,4 +1,4 @@ -From 7da42baba510552c0cb1df21a0c74db0977b0663 Mon Sep 17 00:00:00 2001 +From 7c1fc4cf725d23c3a31727ab1cce1192153f49b8 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 17 Oct 2018 19:17:27 -0400 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles @@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check other worlds. diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 9eed1dce3..6c091b680 100644 +index 9eed1dce3e..6c091b6808 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -209,6 +209,16 @@ public abstract class EntityProjectile extends Entity implements IProjectile { diff --git a/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch b/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch index 549a5b602..432b54e4e 100644 --- a/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch +++ b/Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch @@ -1,11 +1,11 @@ -From 53af1cd635d13b6d5e941ae56d6a8de11cb9d948 Mon Sep 17 00:00:00 2001 +From 10c4e065d6969593212d3373bc14bbe315c450ac Mon Sep 17 00:00:00 2001 From: Caleb Bassham Date: Fri, 28 Sep 2018 02:32:19 -0500 Subject: [PATCH] Call player spectator target events diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4b40ffa97..bf21fb69a 100644 +index 4b40ffa978..bf21fb69a5 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch b/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch index 2dd54e09d..ae82d8404 100644 --- a/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch +++ b/Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch @@ -1,4 +1,4 @@ -From 8ce097c9039a93f8c777387f7d46ff934f0ef995 Mon Sep 17 00:00:00 2001 +From f2b8e4ff03e18854cf4601dc1e62f4a3e3a1e82a Mon Sep 17 00:00:00 2001 From: Andrew Steinborn Date: Mon, 8 Oct 2018 14:36:14 -0400 Subject: [PATCH] Add Velocity IP Forwarding Support @@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13 login plugin message packet. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 092bff78a..79cf4e598 100644 +index 092bff78ab..79cf4e598f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -8,6 +8,7 @@ import java.io.IOException; @@ -58,7 +58,7 @@ index 092bff78a..79cf4e598 100644 } diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java new file mode 100644 -index 000000000..fdd8708f9 +index 0000000000..fdd8708f97 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java @@ -0,0 +1,67 @@ @@ -130,7 +130,7 @@ index 000000000..fdd8708f9 + } +} diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 1c4ac7bf7..47cf10501 100644 +index 1c4ac7bf7a..47cf105019 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener { @@ -206,7 +206,7 @@ index 1c4ac7bf7..47cf10501 100644 } diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 08e314af7..046196d54 100644 +index 08e314af7c..046196d54d 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -44,7 +44,7 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -219,7 +219,7 @@ index 08e314af7..046196d54 100644 public java.util.UUID spoofedUUID; public com.mojang.authlib.properties.Property[] spoofedProfile; diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java -index 93ae6dcd7..fb9186b3f 100644 +index 93ae6dcd78..fb9186b3f5 100644 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf { @@ -247,7 +247,7 @@ index 93ae6dcd7..fb9186b3f 100644 int j = this.i(); diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java -index 4d1f44139..c1ca6f950 100644 +index 4d1f441395..c1ca6f9501 100644 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java @@ -4,8 +4,8 @@ import java.io.IOException; @@ -262,7 +262,7 @@ index 4d1f44139..c1ca6f950 100644 public PacketLoginInCustomPayload() {} diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java -index ae74dc9e1..7eb230f1b 100644 +index ae74dc9e18..7eb230f1b2 100644 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet Date: Fri, 12 Oct 2018 14:10:46 -0500 Subject: [PATCH] Add more Witch API diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java -index be6ecfb08..7b6b1ad17 100644 +index be6ecfb08a..7b6b1ad17b 100644 --- a/src/main/java/net/minecraft/server/EntityWitch.java +++ b/src/main/java/net/minecraft/server/EntityWitch.java @@ -1,5 +1,11 @@ @@ -97,7 +97,7 @@ index be6ecfb08..7b6b1ad17 100644 public SoundEffect eq() { return SoundEffects.ENTITY_WITCH_CELEBRATE; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java -index bae107e76..b43a2bbd5 100644 +index bae107e76e..b43a2bbd5b 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java @@ -1,12 +1,18 @@ diff --git a/Spigot-Server-Patches/0319-Fix-MC-93764.patch b/Spigot-Server-Patches/0319-Fix-MC-93764.patch index edcf164ca..2f59ce339 100644 --- a/Spigot-Server-Patches/0319-Fix-MC-93764.patch +++ b/Spigot-Server-Patches/0319-Fix-MC-93764.patch @@ -1,11 +1,11 @@ -From f2429882921a9ca0d8f156105b09d086589164c7 Mon Sep 17 00:00:00 2001 +From c1caad4782cc4319c9f8d68485e639b12e653197 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Fri, 19 Oct 2018 19:38:45 -0500 Subject: [PATCH] Fix MC-93764 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java -index 9d4fcf8bc..4b9760709 100644 +index 9d4fcf8bcf..4b9760709d 100644 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider { diff --git a/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch b/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch index bbb825283..42e60c6f8 100644 --- a/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch +++ b/Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch @@ -1,4 +1,4 @@ -From f871d28d4e2f369979bf91ffcabdb2f7d180a70a Mon Sep 17 00:00:00 2001 +From d49d31920a9bb9d474e9b3903c537546d055776c Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Mon, 22 Oct 2018 17:34:10 +0200 Subject: [PATCH] Add option to prevent players from moving into unloaded @@ -6,7 +6,7 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index b8789c8ec..0862a1d62 100644 +index b8789c8ecc..0862a1d629 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -427,4 +427,9 @@ public class PaperWorldConfig { @@ -20,7 +20,7 @@ index b8789c8ec..0862a1d62 100644 + } } diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 6627d8402..bde60377e 100644 +index 6627d8402f..bde60377ee 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch b/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch index d3a629654..c3c32c4ef 100644 --- a/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch +++ b/Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch @@ -1,4 +1,4 @@ -From 814b9be864728d180bfab9b681c5695eeb1c9dd8 Mon Sep 17 00:00:00 2001 +From 17d9d277e189ac50ebdde96cac36a33d1df9da68 Mon Sep 17 00:00:00 2001 From: GreenMeanie Date: Sat, 20 Oct 2018 22:34:02 -0400 Subject: [PATCH] Reset players airTicks on respawn diff --git a/Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch index cdcd9056f..b59b12e5c 100644 --- a/Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 1415b8bf619feafdff4bc2889802c28825e6c73c Mon Sep 17 00:00:00 2001 +From 357f80a56ea4cd564371545473218d56cf352568 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed @@ -7,7 +7,7 @@ Mojang was sleeping even if we had no more requests to go after the current one finished, resulting in 100ms lost per profile lookup diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java -index 71e48e87b..23f1447cf 100644 +index 71e48e87b4..23f1447cfc 100644 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository { diff --git a/Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch b/Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch index 6ed820bd1..8fb6d052e 100644 --- a/Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch +++ b/Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch @@ -1,11 +1,11 @@ -From 0adf0a54a9c7fecea654294f0b8a33dae051d6e2 Mon Sep 17 00:00:00 2001 +From eb7d83283a255cb73f5d68acfba8135e22f4fd52 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 23:14:38 -0400 Subject: [PATCH] Use more reasonable thread count default for bootstrap diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java -index 7e224ebef..dc6d03062 100644 +index 7e224ebeff..dc6d030621 100644 --- a/src/main/java/net/minecraft/server/SystemUtils.java +++ b/src/main/java/net/minecraft/server/SystemUtils.java @@ -66,7 +66,7 @@ public class SystemUtils { diff --git a/Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch b/Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch index 5b45068fa..34ec7d47d 100644 --- a/Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch +++ b/Spigot-Server-Patches/0324-Optimize-World-Time-Updates.patch @@ -1,4 +1,4 @@ -From 0951662a1b4fe1206ab3f5507d6aeb05d93ed73d Mon Sep 17 00:00:00 2001 +From 6d75cea2b9d376c88f37e79e922d107e7574b6b6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index a3156d003..2a01e609c 100644 +index a3156d0034..2a01e609c6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1161,12 +1161,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 5 Nov 2018 04:23:51 +0000 Subject: [PATCH] Restore custom InventoryHolder support @@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati based inventories. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java -index 9957ed040..ae280dd40 100644 +index 9957ed0402..ae280dd40b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java @@ -39,10 +39,20 @@ public final class CraftInventoryCreator { diff --git a/Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch b/Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch index 735c48539..635dd4e07 100644 --- a/Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch +++ b/Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch @@ -1,4 +1,4 @@ -From 85ff7573d1b7480d8e511d2716db2cbedbe48acb Mon Sep 17 00:00:00 2001 +From 2673398c97674531a69317266f27b285d6617c6c Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 8 Nov 2018 21:33:09 -0500 Subject: [PATCH] Use Vanilla Minecart Speeds @@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds CraftBukkit changed the values on flying speed, restore back to vanilla diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java -index c2843d5d6..665bbe07f 100644 +index c2843d5d60..665bbe07fa 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -59,9 +59,9 @@ public abstract class EntityMinecartAbstract extends Entity { diff --git a/Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch b/Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch index 648a0f7c3..7e3d43a8a 100644 --- a/Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch +++ b/Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch @@ -1,4 +1,4 @@ -From 3b67e7c6c62205dc6e979fe22afff3148d41a48d Mon Sep 17 00:00:00 2001 +From dd0df9983806142f810d20979d0db8e6a56c2aad Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 10 Nov 2018 05:15:21 +0000 Subject: [PATCH] Fix SpongeAbsortEvent handling @@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling Only process drops when the block is actually going to be removed diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index b9b750c36..540fcce1d 100644 +index b9b750c369..540fcce1dd 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -472,7 +472,7 @@ public class Block implements IMaterial { @@ -19,7 +19,7 @@ index b9b750c36..540fcce1d 100644 if (world instanceof WorldServer) { a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> { diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java -index 685a30f3f..9edf937a6 100644 +index 685a30f3f1..9edf937a65 100644 --- a/src/main/java/net/minecraft/server/BlockSponge.java +++ b/src/main/java/net/minecraft/server/BlockSponge.java @@ -115,8 +115,11 @@ public class BlockSponge extends Block { diff --git a/Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch b/Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch index 1c30257d8..2d33b369e 100644 --- a/Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch +++ b/Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch @@ -1,11 +1,11 @@ -From 38e63e5a220ff15e394cb4f034129a9490317c8e Mon Sep 17 00:00:00 2001 +From 731817567aecff1ae213cabc80dd80618d12256d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 11 Nov 2018 21:01:09 +0000 Subject: [PATCH] Don't allow digging into unloaded chunks diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index bde60377e..b21fca9e5 100644 +index bde60377ee..b21fca9e5c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1272,6 +1272,11 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch b/Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch index 598f63155..3bf64eb4a 100644 --- a/Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch +++ b/Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch @@ -1,4 +1,4 @@ -From 37ce37c395071a338bf1c51f860a6d46891a723d Mon Sep 17 00:00:00 2001 +From d024b4e040e8600d2ba1c38dc0ba06bea9272734 Mon Sep 17 00:00:00 2001 From: theosib Date: Thu, 27 Sep 2018 01:43:35 -0600 Subject: [PATCH] Optimize redstone algorithm @@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee Just added Bukkit's event system and took a few liberties with dead code and comment misspellings. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 0862a1d62..4ba72275b 100644 +index 0862a1d629..4ba72275b9 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -432,4 +432,14 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 0862a1d62..4ba72275b 100644 } diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java new file mode 100644 -index 000000000..b69803cbf +index 0000000000..b69803cbf2 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java @@ -0,0 +1,915 @@ @@ -959,7 +959,7 @@ index 000000000..b69803cbf + } +} diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java -index 5bf2fc0b3..52a4982ec 100644 +index 5bf2fc0b3f..52a4982ecd 100644 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java @@ -1,5 +1,7 @@ @@ -1127,7 +1127,7 @@ index 5bf2fc0b3..52a4982ec 100644 c(iblockdata, world, blockposition); world.a(blockposition, false); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1905aae87..f54743a91 100644 +index 1905aae877..f54743a910 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -520,6 +520,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch b/Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch index 1e90b416e..d4cb7a50e 100644 --- a/Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch +++ b/Spigot-Server-Patches/0330-force-entity-dismount-during-teleportation.patch @@ -1,4 +1,4 @@ -From 1bef7be72cadbd264426f8d9da06bbe630741efb Mon Sep 17 00:00:00 2001 +From df5ca0d0a5055f49eed16e679cd9632f70ceff81 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Thu, 15 Nov 2018 13:38:37 +0000 Subject: [PATCH] force entity dismount during teleportation diff --git a/Spigot-Server-Patches/0331-Book-Size-Limits.patch b/Spigot-Server-Patches/0331-Book-Size-Limits.patch index f93510145..6603d56d6 100644 --- a/Spigot-Server-Patches/0331-Book-Size-Limits.patch +++ b/Spigot-Server-Patches/0331-Book-Size-Limits.patch @@ -1,4 +1,4 @@ -From cc86452dafe8e20308867928af10553f9f385ca8 Mon Sep 17 00:00:00 2001 +From 3277fdb918a44aed04cc28d36e3c4f2139f4d2aa Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Nov 2018 23:08:50 -0500 Subject: [PATCH] Book Size Limits @@ -6,7 +6,7 @@ Subject: [PATCH] Book Size Limits Puts some limits on the size of books. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 421e78d624..47c4c20502 100644 +index 79cf4e598f..6d069c73d0 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -354,4 +354,11 @@ public class PaperConfig { @@ -77,5 +77,5 @@ index b21fca9e5c..784f0a3f22 100644 // CraftBukkit start if (this.lastBookTick + 20 > MinecraftServer.currentTick) { -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch b/Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch index 3c0953c12..de0e33198 100644 --- a/Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch +++ b/Spigot-Server-Patches/0332-Make-the-default-permission-message-configurable.patch @@ -1,11 +1,11 @@ -From 6757eb6bda8ebc7fab9a7f749ad48e9ce3c53adc Mon Sep 17 00:00:00 2001 +From c6ecec6f74ecb1b38a98c0b32ea741630dd2017a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 18 Nov 2018 19:49:56 +0000 Subject: [PATCH] Make the default permission message configurable diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 30f35304a..546a1cfe0 100644 +index 6d069c73d0..dbd1439970 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -20,6 +20,7 @@ import java.util.regex.Pattern; @@ -29,7 +29,7 @@ index 30f35304a..546a1cfe0 100644 private static void savePlayerData() { savePlayerData = getBoolean("settings.save-player-data", savePlayerData); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index fa35b8459..30dd66b81 100644 +index fa35b84597..30dd66b81a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2179,6 +2179,11 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0333-Add-more-Zombie-API.patch b/Spigot-Server-Patches/0333-Add-more-Zombie-API.patch index 01dc98989..c6f989740 100644 --- a/Spigot-Server-Patches/0333-Add-more-Zombie-API.patch +++ b/Spigot-Server-Patches/0333-Add-more-Zombie-API.patch @@ -1,11 +1,11 @@ -From 336c2e0bbfe918d24a5bf09919ef3118255d35ae Mon Sep 17 00:00:00 2001 +From 403c3e442ffe65b277e9e3030749dcbdd59664a9 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 7 Oct 2018 04:29:59 -0500 Subject: [PATCH] Add more Zombie API diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index bed15873b..6d53254f8 100644 +index bed15873b6..6d53254f83 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java @@ -1260,6 +1260,8 @@ public abstract class EntityInsentient extends EntityLiving { @@ -18,7 +18,7 @@ index bed15873b..6d53254f8 100644 byte b0 = (Byte) this.datawatcher.get(EntityInsentient.b); diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 31aba6bfc..2d4f8aac8 100644 +index 31aba6bfc3..2d4f8aac8f 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -33,6 +33,7 @@ public class EntityZombie extends EntityMonster { @@ -92,7 +92,7 @@ index 31aba6bfc..2d4f8aac8 100644 @Override diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java -index 0429cf020..c4320dbb6 100644 +index 0429cf020e..c4320dbb67 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java @@ -80,4 +80,41 @@ public class CraftZombie extends CraftMonster implements Zombie { diff --git a/Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch index 3fffd8268..0e7fb50ce 100644 --- a/Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0334-Prevent-rayTrace-from-loading-chunks.patch @@ -1,4 +1,4 @@ -From 4248f9dda8599dfbaba6698b82dd4dda172481ff Mon Sep 17 00:00:00 2001 +From 0b18f2ae0645cbe0db754c2d68e86cac35d6c836 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 26 Nov 2018 19:21:58 -0500 Subject: [PATCH] Prevent rayTrace from loading chunks @@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss this saves a ton of lag for when AI tries to raytrace near unloaded chunks. diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java -index 0dff02352..29cdc0087 100644 +index 0dff023529..29cdc00875 100644 --- a/src/main/java/net/minecraft/server/IBlockAccess.java +++ b/src/main/java/net/minecraft/server/IBlockAccess.java @@ -41,7 +41,15 @@ public interface IBlockAccess { diff --git a/Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch index 3a6957922..b289c22b3 100644 --- a/Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch +++ b/Spigot-Server-Patches/0335-Handle-Large-Packets-disconnecting-client.patch @@ -1,4 +1,4 @@ -From 25813453920b7238ec7173657d1bdd989006ce0a Mon Sep 17 00:00:00 2001 +From 6c662634eb0563619c0725e6915126ad8811a468 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 27 Nov 2018 21:18:06 -0500 Subject: [PATCH] Handle Large Packets disconnecting client @@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet, split the inventory set into multiple packets instead. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index 046196d54..d4aad8a5b 100644 +index 046196d54d..d4aad8a5b7 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -97,6 +97,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -27,7 +27,7 @@ index 046196d54..d4aad8a5b 100644 NetworkManager.LOGGER.debug("Skipping packet due to errors", throwable.getCause()); } else { diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java -index 601d4d0fa..2d8e6a2f4 100644 +index 601d4d0fa2..2d8e6a2f4a 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -10,6 +10,12 @@ public interface Packet { @@ -44,7 +44,7 @@ index 601d4d0fa..2d8e6a2f4 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java -index 63c4dbd32..b0cfef52c 100644 +index 63c4dbd327..b0cfef52cb 100644 --- a/src/main/java/net/minecraft/server/PacketEncoder.java +++ b/src/main/java/net/minecraft/server/PacketEncoder.java @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder> { @@ -80,7 +80,7 @@ index 63c4dbd32..b0cfef52c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index 1fcbbd698..a0b87f89d 100644 +index 1fcbbd698a..a0b87f89df 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -79,7 +79,7 @@ public class PacketPlayOutMapChunk implements Packet { @@ -93,7 +93,7 @@ index 1fcbbd698..a0b87f89d 100644 } else { this.f = new byte[i]; diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java -index f7c365567..631234324 100644 +index f7c3655671..631234324d 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet { diff --git a/Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch b/Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch index a92bd5960..bd913efdd 100644 --- a/Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch +++ b/Spigot-Server-Patches/0336-Lazy-init-world-storage-in-CraftOfflinePlayer.patch @@ -1,4 +1,4 @@ -From 056df6fc2c3ec97f7c45d3df310ca358e91387e0 Mon Sep 17 00:00:00 2001 +From e46e47cca906d804941139efa76bada8d5520a4d Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 11 Dec 2018 22:25:07 -0500 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer @@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that should be covered as best we can. diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index 6a448c02e..c1ef1c950 100644 +index 6a448c02ec..c1ef1c950d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -25,12 +25,12 @@ import org.bukkit.plugin.Plugin; diff --git a/Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch b/Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch index 4206d2b15..0f2c20bbb 100644 --- a/Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch +++ b/Spigot-Server-Patches/0337-Add-PlayerConnectionCloseEvent.patch @@ -1,4 +1,4 @@ -From 2993f6b09ebba87d6dfe22cbbd01f5632d8ba2e5 Mon Sep 17 00:00:00 2001 +From 817b29c60b194d49647cc3c94974d940c28d0e1b Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sun, 7 Oct 2018 12:05:28 -0700 Subject: [PATCH] Add PlayerConnectionCloseEvent @@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent is undefined. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 47cf10501..f1222fcb2 100644 +index 47cf105019..f1222fcb2b 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener { @@ -50,7 +50,7 @@ index 47cf10501..f1222fcb2 100644 private SecretKey loginKey; private EntityPlayer l; diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index d4aad8a5b..b1dededc1 100644 +index d4aad8a5b7..b1dededc15 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -336,6 +336,26 @@ public class NetworkManager extends SimpleChannelInboundHandler> { diff --git a/Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch b/Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch index dd638355c..d42ff7932 100644 --- a/Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch +++ b/Spigot-Server-Patches/0338-Prevent-Enderman-from-loading-chunks.patch @@ -1,11 +1,11 @@ -From 77bf776b67d4dc1ab7143973d3ffc8d27a04d56a Mon Sep 17 00:00:00 2001 +From 310587904068d7184d634eab7f33c6e978542953 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 18 Dec 2018 02:15:08 +0000 Subject: [PATCH] Prevent Enderman from loading chunks diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java -index d86f76f30..212636dcb 100644 +index d86f76f30b..212636dcb2 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -344,7 +344,8 @@ public class EntityEnderman extends EntityMonster { diff --git a/Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch index 021ca1549..26889a1d9 100644 --- a/Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch +++ b/Spigot-Server-Patches/0339-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch @@ -1,4 +1,4 @@ -From 49076780ef46a0d6bc492de2a79ef628bbfd6302 Mon Sep 17 00:00:00 2001 +From d14e80a658660914866df1ffc0fb822377a0c469 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 2 Jan 2019 00:35:43 -0600 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed @@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and documented as to their purpose. diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 35ea47601..4cff86b9a 100644 +index 35ea476014..4cff86b9a5 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -76,6 +76,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -28,7 +28,7 @@ index 35ea47601..4cff86b9a 100644 public boolean queueHealthUpdatePacket = false; public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index e46436623..659ce2181 100644 +index e46436623c..659ce21818 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -94,6 +94,7 @@ public abstract class PlayerList { @@ -40,7 +40,7 @@ index e46436623..659ce2181 100644 UserCache usercache = this.server.getUserCache(); GameProfile gameprofile1 = usercache.getProfile(gameprofile.getId()); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java -index c1ef1c950..3824180ee 100644 +index c1ef1c950d..3824180ee5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java @@ -256,6 +256,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa @@ -106,7 +106,7 @@ index c1ef1c950..3824180ee 100644 public Location getBedSpawnLocation() { NBTTagCompound data = getData(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 878287cf0..2de233df3 100644 +index 878287cf0d..2de233df35 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -140,6 +140,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch b/Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch index 4491d3b1a..17b9c9d5b 100644 --- a/Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch +++ b/Spigot-Server-Patches/0340-Fix-PlayerEditBookEvent.patch @@ -1,4 +1,4 @@ -From e12abf92b401d1f8780775d955d7e25490deed0f Mon Sep 17 00:00:00 2001 +From e4ed1181f339cd1c902b1f47268f8d5d3d68b191 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Sun, 16 Dec 2018 13:07:33 +1100 Subject: [PATCH] Fix PlayerEditBookEvent @@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta cancelled writing diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 784f0a3f2..4b3ddfd99 100644 +index 784f0a3f22..4b3ddfd990 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -871,9 +871,11 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index af2331072..b5f924473 100644 --- a/Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0341-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,11 +1,11 @@ -From 314d6ed2dc875a55f9aa543efa1c320a9d1107a8 Mon Sep 17 00:00:00 2001 +From 78db660f3d889b2346cf6167b5b5fc544f061ebc Mon Sep 17 00:00:00 2001 From: connorhartley Date: Mon, 7 Jan 2019 14:43:48 -0600 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4cff86b9a..f788e7eff 100644 +index 4cff86b9a5..f788e7eff0 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1296,6 +1296,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch b/Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch index 4dbd40827..9af25b26a 100644 --- a/Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch +++ b/Spigot-Server-Patches/0342-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch @@ -1,4 +1,4 @@ -From b45490e7fde16d25dba70bd5cb84f70140dea0fb Mon Sep 17 00:00:00 2001 +From d578f08ab7c144a50ac7a067718d0a49e9657fc1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 31 Jan 2019 16:33:36 -0500 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons @@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for all piston types. diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java -index 1170a2810..b29525c40 100644 +index 1170a28107..b29525c40d 100644 --- a/src/main/java/net/minecraft/server/BlockPiston.java +++ b/src/main/java/net/minecraft/server/BlockPiston.java @@ -122,7 +122,7 @@ public class BlockPiston extends BlockDirectional { diff --git a/Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch b/Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch index 2119cd277..c77801640 100644 --- a/Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch +++ b/Spigot-Server-Patches/0343-Block-Entity-remove-from-being-called-on-Players.patch @@ -1,4 +1,4 @@ -From 201695f239bcc25aec86f4ed04e293e780983e00 Mon Sep 17 00:00:00 2001 +From 43396bf6e30641ec40dc9be1f6b7cd817b3783f3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Feb 2019 23:33:24 -0500 Subject: [PATCH] Block Entity#remove from being called on Players @@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to be unintentional in the few cases we've seen so far. diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 2de233df3..74a9e8f22 100644 +index 2de233df35..74a9e8f22e 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1985,6 +1985,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0344-BlockDestroyEvent.patch b/Spigot-Server-Patches/0344-BlockDestroyEvent.patch index 675da7fb6..33595be45 100644 --- a/Spigot-Server-Patches/0344-BlockDestroyEvent.patch +++ b/Spigot-Server-Patches/0344-BlockDestroyEvent.patch @@ -1,4 +1,4 @@ -From d091b152b688cf67bdff1da8dbf86ab566048349 Mon Sep 17 00:00:00 2001 +From 4136cfa283d5cb6840b17d4dcdc2c1b5c8ee0012 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 6 Feb 2019 00:20:33 -0500 Subject: [PATCH] BlockDestroyEvent @@ -11,7 +11,7 @@ floating in the air. This can replace many uses of BlockPhysicsEvent diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index f54743a91..67a088f19 100644 +index f54743a910..67a088f19a 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -450,8 +450,20 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch b/Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch index 196fe4479..b56befc16 100644 --- a/Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch +++ b/Spigot-Server-Patches/0345-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch @@ -1,4 +1,4 @@ -From 7a6cf1744fae0cdf1c73e252f3bc687f9a438443 Mon Sep 17 00:00:00 2001 +From ee7d60b9b3c1f68c95c61c3822229dc61b9f2919 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Jan 2019 00:08:15 -0500 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes @@ -10,7 +10,7 @@ This made the Bukkit RecipeChoice API not work for Shapeless. This reimplements vanilla logic using the same test logic as Shaped diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java -index fe03a35cc..fb481e658 100644 +index fe03a35cc8..fb481e6586 100644 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java @@ -63,16 +63,46 @@ public class ShapelessRecipes implements RecipeCrafting { diff --git a/Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch b/Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch index 0b54a32ab..c6daa1aea 100644 --- a/Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch +++ b/Spigot-Server-Patches/0346-Fix-sign-edit-memory-leak.patch @@ -1,4 +1,4 @@ -From 853e3159e767ca1a4891e0667e29facdea7d7c6d Mon Sep 17 00:00:00 2001 +From e6fe80f05b58ef14d0b08b642a78738f02396df0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Feb 2019 00:15:28 -0500 Subject: [PATCH] Fix sign edit memory leak @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak when a player edits a sign, a reference to their Entity is never cleand up. diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 4b3ddfd99..2c94ca6a8 100644 +index 4b3ddfd990..2c94ca6a8e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2546,7 +2546,7 @@ public class PlayerConnection implements PacketListenerPlayIn { @@ -19,7 +19,7 @@ index 4b3ddfd99..2c94ca6a8 100644 this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit return; diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index 03f6ddf00..a93402019 100644 +index 03f6ddf000..a934020190 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -10,6 +10,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // diff --git a/Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch b/Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch index ced90fc22..90f33bde3 100644 --- a/Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch +++ b/Spigot-Server-Patches/0347-Limit-Client-Sign-length-more.patch @@ -1,4 +1,4 @@ -From 55c5ebed011c753b9ae3709fe44b131973154b2b Mon Sep 17 00:00:00 2001 +From 2a139e9bff6e0fade16b208fb980f5d81baf59b9 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Feb 2019 22:18:40 -0500 Subject: [PATCH] Limit Client Sign length more @@ -22,7 +22,7 @@ it only impacts data sent from the client. Set -DPaper.maxSignLength=XX to change limit or -1 to disable diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 2c94ca6a8..94d3d602c 100644 +index 2c94ca6a8e..94d3d602cc 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -103,6 +103,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch b/Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch index 35175b30f..5e9c0e598 100644 --- a/Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch +++ b/Spigot-Server-Patches/0348-Don-t-check-ConvertSigns-boolean-every-sign-save.patch @@ -1,4 +1,4 @@ -From a6a46362f01a8bfd215c0f533f88fe4bb22eadcd Mon Sep 17 00:00:00 2001 +From 637aecc80350e9ff1caaf82c66031b83347eb13b Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 11:11:29 -0500 Subject: [PATCH] Don't check ConvertSigns boolean every sign save @@ -7,7 +7,7 @@ property lookups arent super cheap. they synchronize, validate and check security managers. diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java -index a93402019..0e9a90b70 100644 +index a934020190..0e9a90b70f 100644 --- a/src/main/java/net/minecraft/server/TileEntitySign.java +++ b/src/main/java/net/minecraft/server/TileEntitySign.java @@ -11,6 +11,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { // diff --git a/Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch b/Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch index 7b7c0fc30..f63ad3121 100644 --- a/Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch +++ b/Spigot-Server-Patches/0349-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch @@ -1,4 +1,4 @@ -From 6ad4c8232466541a835a56d0f8bd9dbd9cea9c45 Mon Sep 17 00:00:00 2001 +From 9e4aa7107314e194495592ea74715008dd3b7fb4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 14:55:01 -0500 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of @@ -11,7 +11,7 @@ Use -DPaper.excessiveSignsLimit=500 to configure that limit, or -1 to disable the limit and let your players be abused. diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java -index b1dededc1..e156804f7 100644 +index b1dededc15..e156804f7a 100644 --- a/src/main/java/net/minecraft/server/NetworkManager.java +++ b/src/main/java/net/minecraft/server/NetworkManager.java @@ -212,6 +212,15 @@ public class NetworkManager extends SimpleChannelInboundHandler> { @@ -31,7 +31,7 @@ index b1dededc1..e156804f7 100644 private void sendPacketQueue() { this.o(); } // Paper - OBFHELPER diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java -index 2d8e6a2f4..8d0965a05 100644 +index 2d8e6a2f4a..8d0965a053 100644 --- a/src/main/java/net/minecraft/server/Packet.java +++ b/src/main/java/net/minecraft/server/Packet.java @@ -11,6 +11,7 @@ public interface Packet { @@ -43,7 +43,7 @@ index 2d8e6a2f4..8d0965a05 100644 return false; } diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java -index a0b87f89d..47710067a 100644 +index a0b87f89df..47710067a6 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java @@ -23,6 +23,15 @@ public class PacketPlayOutMapChunk implements Packet { diff --git a/Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch b/Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch index f2601a797..5e9874bbc 100644 --- a/Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch +++ b/Spigot-Server-Patches/0350-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch @@ -1,4 +1,4 @@ -From 928067ebeaf0ff169a21ea2a566be5a9854de892 Mon Sep 17 00:00:00 2001 +From 4158af0b55c5eb77140471ab1226affbceab7e34 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 2 Mar 2019 16:12:35 -0500 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency @@ -11,7 +11,7 @@ everything to the Whitelist object. https://github.com/PaperMC/Paper/issues/1880 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java -index 8570e38f4..c97be42dd 100644 +index 8570e38f42..c97be42dd7 100644 --- a/src/main/java/net/minecraft/server/JsonList.java +++ b/src/main/java/net/minecraft/server/JsonList.java @@ -64,6 +64,7 @@ public class JsonList> { @@ -23,7 +23,7 @@ index 8570e38f4..c97be42dd 100644 this.e = flag; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 659ce2181..62d807597 100644 +index 659ce21818..62d8075971 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -62,7 +62,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch b/Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch index 7202ba004..6fb1b9b00 100644 --- a/Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch +++ b/Spigot-Server-Patches/0351-Set-Zombie-last-tick-at-start-of-drowning-process.patch @@ -1,4 +1,4 @@ -From 52fff59f5d752190604decc551b436c2cef9688d Mon Sep 17 00:00:00 2001 +From acb56c4cf6eb06a4145906fea74407247e7b4843 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 4 Mar 2019 02:23:28 -0500 Subject: [PATCH] Set Zombie last tick at start of drowning process @@ -6,7 +6,7 @@ Subject: [PATCH] Set Zombie last tick at start of drowning process Fixes GH-1887 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java -index 2d4f8aac8..8635d4f40 100644 +index 2d4f8aac8f..8635d4f40c 100644 --- a/src/main/java/net/minecraft/server/EntityZombie.java +++ b/src/main/java/net/minecraft/server/EntityZombie.java @@ -169,6 +169,7 @@ public class EntityZombie extends EntityMonster { diff --git a/Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch b/Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch index 12cd4242d..32265dd7d 100644 --- a/Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch +++ b/Spigot-Server-Patches/0352-Allow-Saving-of-Oversized-Chunks.patch @@ -1,4 +1,4 @@ -From b6e1b29bcd7823c0868ba32bb8e14a2f54f39f58 Mon Sep 17 00:00:00 2001 +From 8459076d6ce5365b5b1b2223954b63cd345d8458 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 15 Feb 2019 01:08:19 -0500 Subject: [PATCH] Allow Saving of Oversized Chunks @@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns to a jar with this fix, the data will be restored. diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java -index db66d4ac7..2322c0c8c 100644 +index db66d4ac7d..2322c0c8c5 100644 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java @@ -69,6 +69,7 @@ public class NBTCompressedStreamTools { @@ -51,7 +51,7 @@ index db66d4ac7..2322c0c8c 100644 a((NBTBase) nbttagcompound, dataoutput); } diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java -index cee1ea8f4..6b543f89d 100644 +index cee1ea8f43..6b543f89d4 100644 --- a/src/main/java/net/minecraft/server/RegionFile.java +++ b/src/main/java/net/minecraft/server/RegionFile.java @@ -17,6 +17,8 @@ import java.nio.file.Files; @@ -156,7 +156,7 @@ index cee1ea8f4..6b543f89d 100644 private final ChunkCoordIntPair b; diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java -index 57ce53cfd..b3d1bb5fd 100644 +index 57ce53cfdc..b3d1bb5fd8 100644 --- a/src/main/java/net/minecraft/server/RegionFileCache.java +++ b/src/main/java/net/minecraft/server/RegionFileCache.java @@ -42,10 +42,84 @@ public final class RegionFileCache implements AutoCloseable { diff --git a/Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch b/Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch index 1071da463..85bb8492b 100644 --- a/Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch +++ b/Spigot-Server-Patches/0353-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch @@ -1,11 +1,11 @@ -From 5bf948b7dd7242482fcdd8f477ab37a768915835 Mon Sep 17 00:00:00 2001 +From 0c2fa6c8784074f1661af8293202ede417687567 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 13 Mar 2019 20:08:09 +0200 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 62d807597..9d715d891 100644 +index 62d8075971..9d715d891d 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1035,6 +1035,7 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch b/Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch index 9a6e38b0a..95025ea69 100644 --- a/Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch +++ b/Spigot-Server-Patches/0354-Add-LivingEntity-getTargetEntity.patch @@ -1,4 +1,4 @@ -From 939338ec61ac52ca1724350d9cc7b59a1b3cbd84 Mon Sep 17 00:00:00 2001 +From 42a1a2cfcf34d8a784356b24b3bee76f62a82b8b Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 22 Sep 2018 00:33:08 -0500 Subject: [PATCH] Add LivingEntity#getTargetEntity diff --git a/Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch b/Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch index adb06577c..05e996c89 100644 --- a/Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch +++ b/Spigot-Server-Patches/0355-Use-proper-max-length-when-serialising-BungeeCord-te.patch @@ -1,4 +1,4 @@ -From 4440c63b167cf2748361545a0f1b4ef376198331 Mon Sep 17 00:00:00 2001 +From 79a52da2e13be31fd550ffd6b4a585acda7111e7 Mon Sep 17 00:00:00 2001 From: kashike Date: Wed, 20 Mar 2019 21:19:29 -0700 Subject: [PATCH] Use proper max length when serialising BungeeCord text @@ -6,7 +6,7 @@ Subject: [PATCH] Use proper max length when serialising BungeeCord text diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java -index 0ab611564..f7b2095bb 100644 +index 0ab611564e..f7b2095bb7 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java @@ -3,7 +3,7 @@ package net.minecraft.server; diff --git a/Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch b/Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch index 7a0c34476..fba1564e6 100644 --- a/Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch +++ b/Spigot-Server-Patches/0356-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From bd6fac975495dae43fbad0d9d1ea8c6b97c5dccc Mon Sep 17 00:00:00 2001 +From 1a338ddfa521b1e56ca2a8b6aad3297d38df88bf Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:24:52 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 5b7cdd66e3..b45afbcde2 100644 +index 69bc9dae0d..1a20f105b5 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke @@ -99,5 +99,5 @@ index 915ccb1807..dfa15372b8 100644 // Paper end } -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch b/Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch index fccaff0dc..aa3ddad50 100644 --- a/Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch +++ b/Spigot-Server-Patches/0357-Update-entity-Metadata-for-all-tracked-players.patch @@ -1,11 +1,11 @@ -From 09fd0185c98d369fd927818ec6b3823ab0b1e0b5 Mon Sep 17 00:00:00 2001 +From fb02d10f272867f3e97c90e44c560a96ebdba057 Mon Sep 17 00:00:00 2001 From: AgentTroll Date: Fri, 22 Mar 2019 22:24:03 -0700 Subject: [PATCH] Update entity Metadata for all tracked players diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java -index 3ff7a7b4a..3a88c9a67 100644 +index 3ff7a7b4a8..3a88c9a670 100644 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java @@ -387,6 +387,12 @@ public class EntityTrackerEntry { @@ -22,7 +22,7 @@ index 3ff7a7b4a..3a88c9a67 100644 this.f.accept(packet); if (this.tracker instanceof EntityPlayer) { diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 94d3d602c..eee96c3a1 100644 +index 94d3d602cc..eee96c3a1c 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -2006,7 +2006,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch b/Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch index 45138154a..a403f192c 100644 --- a/Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch +++ b/Spigot-Server-Patches/0358-Fire-event-on-GS4-query.patch @@ -1,11 +1,11 @@ -From b9ab4c1082deca70510920d53f396778dbecda5c Mon Sep 17 00:00:00 2001 +From 0d8d79a4c81abb054f62614331c21d3d3ca2b54a Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 17 Mar 2019 21:46:56 +0200 Subject: [PATCH] Fire event on GS4 query diff --git a/src/main/java/net/minecraft/server/RemoteConnectionThread.java b/src/main/java/net/minecraft/server/RemoteConnectionThread.java -index 66bfbcf02..d821ef9a7 100644 +index 66bfbcf02b..d821ef9a75 100644 --- a/src/main/java/net/minecraft/server/RemoteConnectionThread.java +++ b/src/main/java/net/minecraft/server/RemoteConnectionThread.java @@ -15,7 +15,7 @@ public abstract class RemoteConnectionThread implements Runnable { @@ -26,7 +26,7 @@ index 66bfbcf02..d821ef9a7 100644 return this.b.getPlayerCount(); } diff --git a/src/main/java/net/minecraft/server/RemoteStatusListener.java b/src/main/java/net/minecraft/server/RemoteStatusListener.java -index f4f4e31d3..d50259384 100644 +index f4f4e31d3c..d502593847 100644 --- a/src/main/java/net/minecraft/server/RemoteStatusListener.java +++ b/src/main/java/net/minecraft/server/RemoteStatusListener.java @@ -21,19 +21,19 @@ public class RemoteStatusListener extends RemoteConnectionThread { @@ -184,7 +184,7 @@ index f4f4e31d3..d50259384 100644 } } diff --git a/src/main/java/net/minecraft/server/RemoteStatusReply.java b/src/main/java/net/minecraft/server/RemoteStatusReply.java -index 848b5c3f0..73efea7e1 100644 +index 848b5c3f0e..73efea7e13 100644 --- a/src/main/java/net/minecraft/server/RemoteStatusReply.java +++ b/src/main/java/net/minecraft/server/RemoteStatusReply.java @@ -18,15 +18,27 @@ public class RemoteStatusReply { diff --git a/Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch b/Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch index 5535125f0..765cf95e6 100644 --- a/Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch +++ b/Spigot-Server-Patches/0359-Implement-PlayerPostRespawnEvent.patch @@ -1,11 +1,11 @@ -From e5ca045e528e65fcee179517595428a7305c6eba Mon Sep 17 00:00:00 2001 +From 202ebb42cea4c461c61a68e1d10449257092f24b Mon Sep 17 00:00:00 2001 From: MisterVector Date: Fri, 26 Oct 2018 21:31:00 -0700 Subject: [PATCH] Implement PlayerPostRespawnEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 49437f212..68e089a4b 100644 +index 49437f2124..68e089a4b6 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -638,9 +638,14 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch b/Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch index da3aaffd2..036b4b1cb 100644 --- a/Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch +++ b/Spigot-Server-Patches/0360-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch @@ -1,4 +1,4 @@ -From 774a47c222a3586c16552cdb2cf59add17fb6a0f Mon Sep 17 00:00:00 2001 +From 52fffe0243ede3145bcdf5a5b12ca21504cc98fe Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 18:09:20 -0400 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items @@ -6,7 +6,7 @@ Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items vanilla checks for == 0 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index e5c9bac88..ef2cf6565 100644 +index e5c9bac88a..ef2cf6565b 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -60,6 +60,7 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch b/Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch index 0670408bd..51df6490d 100644 --- a/Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch +++ b/Spigot-Server-Patches/0361-Implement-getters-and-setters-for-EntityItem-owner-a.patch @@ -1,4 +1,4 @@ -From 672da9d28a3692369f6868967f88f12aa42ef128 Mon Sep 17 00:00:00 2001 +From 76d722bc00e385c91b6eafbef22e327d0164ceac Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 6 Oct 2018 20:54:23 -0500 Subject: [PATCH] Implement getters and setters for EntityItem owner and @@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java -index 3f552b590..cb756b1ba 100644 +index 3f552b5905..cb756b1ba0 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java @@ -8,6 +8,11 @@ import org.bukkit.entity.EntityType; diff --git a/Spigot-Server-Patches/0362-Server-Tick-Events.patch b/Spigot-Server-Patches/0362-Server-Tick-Events.patch index f38c481a5..478c53df0 100644 --- a/Spigot-Server-Patches/0362-Server-Tick-Events.patch +++ b/Spigot-Server-Patches/0362-Server-Tick-Events.patch @@ -1,4 +1,4 @@ -From 4e6377ff36d7ddf7bd38316944c2d7bb737c3da7 Mon Sep 17 00:00:00 2001 +From de744a76882cd1dcede8acef0c51adaf42d9f839 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events @@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events Fires event at start and end of a server tick diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2a01e609c..2801a3ee6 100644 +index 2a01e609c6..2801a3ee69 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1086,6 +1086,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 27 Mar 2019 23:01:33 -0400 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep @@ -8,7 +8,7 @@ Exposes a mutable array on items a player should keep on death Example Usage: https://gist.github.com/aikar/5bb202de6057a051a950ce1f29feb0b4 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index f788e7eff..d00b687d2 100644 +index f788e7eff0..d00b687d25 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -516,6 +516,46 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch b/Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch index 3689a28e0..0d8490143 100644 --- a/Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch +++ b/Spigot-Server-Patches/0364-Optimize-Captured-TileEntity-Lookup.patch @@ -1,4 +1,4 @@ -From 2c4a4a5bc9a3ca42785e1ed4a375f960efe14a32 Mon Sep 17 00:00:00 2001 +From c81d94f3096231156a7dd06eb86bc98791400537 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Apr 2019 10:16:48 -0400 Subject: [PATCH] Optimize Captured TileEntity Lookup @@ -10,7 +10,7 @@ Optimize to check if the captured list even has values in it, and also to just do a get call since the value can never be null. diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 67a088f19..4aca398f1 100644 +index 67a088f19a..4aca398f10 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -996,12 +996,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0365-Add-Heightmap-API.patch b/Spigot-Server-Patches/0365-Add-Heightmap-API.patch index 9cec36f56..7575e6237 100644 --- a/Spigot-Server-Patches/0365-Add-Heightmap-API.patch +++ b/Spigot-Server-Patches/0365-Add-Heightmap-API.patch @@ -1,4 +1,4 @@ -From c9c4eeb2a922810a03372f2fef80f6de1e5c48fe Mon Sep 17 00:00:00 2001 +From 96e7b7431ce369a046487a5dfa4514621b9163e9 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 1 Jan 2019 02:22:01 -0800 Subject: [PATCH] Add Heightmap API @@ -54,5 +54,5 @@ index 06b2e8b910..693dc983cd 100644 public Location getSpawnLocation() { BlockPosition spawn = world.getSpawn(); -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch b/Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch index 6ce17f577..65bafdccf 100644 --- a/Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch +++ b/Spigot-Server-Patches/0366-Mob-Spawner-API-Enhancements.patch @@ -1,11 +1,11 @@ -From e2d2f78aff2944fd5e38c2de61da4464b3875308 Mon Sep 17 00:00:00 2001 +From 65f0a4c0694845e231c667a4ac588011c715f692 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 19 Apr 2019 12:41:13 -0500 Subject: [PATCH] Mob Spawner API Enhancements diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index cb7cb789b..41001b02a 100644 +index cb7cb789b8..41001b02a6 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -47,6 +47,7 @@ public abstract class MobSpawnerAbstract { @@ -82,7 +82,7 @@ index cb7cb789b..41001b02a 100644 nbttagcompound.setShort("MaxNearbyEntities", (short) this.maxNearbyEntities); nbttagcompound.setShort("RequiredPlayerRange", (short) this.requiredPlayerRange); diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java -index 5c4c3c70c..e78e3804b 100644 +index 5c4c3c70c7..e78e3804ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftCreatureSpawner.java @@ -121,4 +121,16 @@ public class CraftCreatureSpawner extends CraftBlockEntityState Date: Mon, 6 May 2019 01:29:25 -0400 Subject: [PATCH] Per-Player View Distance API placeholders @@ -7,7 +7,7 @@ I hope to look at this more in-depth soon. It appears doable. However this should not block the update. diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 6a4ccaeb0..af10fc36e 100644 +index 6a4ccaeb0f..af10fc36e0 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -579,9 +579,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -23,7 +23,7 @@ index 6a4ccaeb0..af10fc36e 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 2e95069c1..8977c3516 100644 +index 2e95069c19..8977c3516b 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity { @@ -39,7 +39,7 @@ index 2e95069c1..8977c3516 100644 double deltaX = this.locX() - player.locX(); double deltaZ = this.locZ() - player.locZ(); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 74a9e8f22..60f62f19c 100644 +index 74a9e8f22e..60f62f19cb 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1994,6 +1994,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch b/Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch index 7140de1aa..83955b70f 100644 --- a/Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch +++ b/Spigot-Server-Patches/0368-Fix-CB-call-to-changed-postToMainThread-method.patch @@ -1,11 +1,11 @@ -From 880f6d517145cf31908bfe78622cc56be1db41f6 Mon Sep 17 00:00:00 2001 +From 68788693b68920cfea5f3efe0901f3bc7e8cb222 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 10 May 2019 18:38:19 +0100 Subject: [PATCH] Fix CB call to changed postToMainThread method diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index eee96c3a1..691331217 100644 +index eee96c3a1c..691331217b 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -286,7 +286,7 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch b/Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch index 0bbef3f88..27f269615 100644 --- a/Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch +++ b/Spigot-Server-Patches/0369-Fix-sounds-when-item-frames-are-modified-MC-123450.patch @@ -1,4 +1,4 @@ -From 0fc4126c1f3488816099232c353537dd50a5f7d7 Mon Sep 17 00:00:00 2001 +From 0b061b69e8b47759afb34347b3a0d4da109741ce Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 27 Apr 2019 20:00:43 +0100 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) @@ -6,7 +6,7 @@ Subject: [PATCH] Fix sounds when item frames are modified (MC-123450) This also fixes the adding sound playing when the item frame direction is changed. diff --git a/src/main/java/net/minecraft/server/EntityItemFrame.java b/src/main/java/net/minecraft/server/EntityItemFrame.java -index 9b1e07452..f8a2f32f1 100644 +index 9b1e07452f..f8a2f32f1d 100644 --- a/src/main/java/net/minecraft/server/EntityItemFrame.java +++ b/src/main/java/net/minecraft/server/EntityItemFrame.java @@ -224,7 +224,7 @@ public class EntityItemFrame extends EntityHanging { @@ -19,7 +19,7 @@ index 9b1e07452..f8a2f32f1 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java -index 799036f26..9ad180d94 100644 +index 799036f268..9ad180d946 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java @@ -49,7 +49,7 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame { diff --git a/Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch b/Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch index 935d4689b..2f64fd821 100644 --- a/Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch +++ b/Spigot-Server-Patches/0370-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch @@ -1,4 +1,4 @@ -From 3ce68dd2077bfb0a4c2984ff0d300615083fe637 Mon Sep 17 00:00:00 2001 +From 5c1cea009bcee4988d6e2d2673d9146de87d27c5 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 13 May 2019 21:10:59 -0700 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer @@ -16,7 +16,7 @@ handling that should have been handled synchronously will be handled synchronously when the server gets shut down. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 2801a3ee6..3ede5ce2a 100644 +index 2801a3ee69..3ede5ce2a6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -2211,7 +2211,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 28 Sep 2018 21:49:53 -0400 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks @@ -41,5 +41,5 @@ index 64bd41f1e3..1221c30a99 100644 if (!(ichunkaccess instanceof Chunk)) { return false; -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch b/Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch index 7eeb6009e..634b93d14 100644 --- a/Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch +++ b/Spigot-Server-Patches/0372-Duplicate-UUID-Resolve-Option.patch @@ -1,4 +1,4 @@ -From eb61a8fb753ca85c13d9082018a8581b00bcbc2f Mon Sep 17 00:00:00 2001 +From ce13336d3fb72611127734a52c8e8f07e2c9a558 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 21 Jul 2018 14:27:34 -0400 Subject: [PATCH] Duplicate UUID Resolve Option diff --git a/Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch b/Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch index ac82dc20b..7a5808c60 100644 --- a/Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch +++ b/Spigot-Server-Patches/0373-improve-CraftWorld-isChunkLoaded.patch @@ -1,4 +1,4 @@ -From 8d626cf3e3891730f6744993b993d5dae8192920 Mon Sep 17 00:00:00 2001 +From cffa12c996fd375a43a440ef15fec62f764a6c85 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 21 May 2019 02:34:04 +0100 Subject: [PATCH] improve CraftWorld#isChunkLoaded @@ -30,5 +30,5 @@ index 693dc983cd..8b6d22e710 100644 throw new RuntimeException(ex); } -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch index 9cb53675c..78ce4fafd 100644 --- a/Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch +++ b/Spigot-Server-Patches/0374-Configurable-Keep-Spawn-Loaded-range-per-world.patch @@ -1,4 +1,4 @@ -From 77aee9d21edeabdc2ddc8e6b1102f74d024c6d53 Mon Sep 17 00:00:00 2001 +From 4f2c7b51c1f4e3843157f9465b39581b7509f6f3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 13 Sep 2014 23:14:43 -0400 Subject: [PATCH] Configurable Keep Spawn Loaded range per world diff --git a/Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch b/Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch index ae16a146e..ac838435b 100644 --- a/Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch +++ b/Spigot-Server-Patches/0375-Fix-some-generation-concurrency-issues.patch @@ -1,11 +1,11 @@ -From 85d80bfd0297e90159aaae51179240084a62a27a Mon Sep 17 00:00:00 2001 +From b1742ef0975ffc23be4a35f33960fc7848aa7753 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 24 May 2019 07:53:16 +0100 Subject: [PATCH] Fix some generation concurrency issues diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 20d9dd839..18e0ca2c7 100644 +index 20d9dd839c..18e0ca2c78 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -86,6 +86,23 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -33,7 +33,7 @@ index 20d9dd839..18e0ca2c7 100644 public CraftWorld getWorld() { return this.world; diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java -index 22e14fe1e..e2af6d43b 100644 +index 22e14fe1e9..e2af6d43b2 100644 --- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java +++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java @@ -23,18 +23,18 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr @@ -59,7 +59,7 @@ index 22e14fe1e..e2af6d43b 100644 builder.put(dynamicops.createString("type"), dynamicops.createString(IRegistry.t.getKey(this.a).toString())).put(dynamicops.createString("entries"), this.b.a(dynamicops, (iblockdata) -> { diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java -index fc4348b60..44be7169f 100644 +index fc4348b602..44be7169ff 100644 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java @@ -10,10 +10,12 @@ import javax.annotation.Nullable; diff --git a/Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch b/Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch index 0ffc5ef3b..78c003538 100644 --- a/Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch +++ b/Spigot-Server-Patches/0376-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch @@ -1,4 +1,4 @@ -From 14cb921e48ce989d6b2ee72d8e89d0a5da1cb69f Mon Sep 17 00:00:00 2001 +From f5defa4d12aeb4c9f7e900afe4cb4170884fa900 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 27 May 2019 17:35:39 -0500 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative @@ -6,7 +6,7 @@ Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative diff --git a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java -index e8f3e55fd..44289c230 100644 +index e8f3e55fd3..44289c2301 100644 --- a/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java +++ b/src/main/java/net/minecraft/server/EntityAreaEffectCloud.java @@ -175,6 +175,12 @@ public class EntityAreaEffectCloud extends Entity { diff --git a/Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch b/Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch index e5f3f4c4e..29413bd2c 100644 --- a/Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch +++ b/Spigot-Server-Patches/0377-ChunkMapDistance-CME.patch @@ -1,11 +1,11 @@ -From 5dc5395f858f62242b86303d0451962fe3fa7a65 Mon Sep 17 00:00:00 2001 +From ec5bb794058e28e30c5a7afe1a70cbad3da5f928 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 29 May 2019 04:01:22 +0100 Subject: [PATCH] ChunkMapDistance CME diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java -index 8b3b1f9bd..73d157076 100644 +index ae66129777..0244768f76 100644 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java @@ -33,7 +33,7 @@ public abstract class ChunkMapDistance { diff --git a/Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch b/Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch index a78ddfa9e..c76949128 100644 --- a/Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch +++ b/Spigot-Server-Patches/0378-Implement-CraftBlockSoundGroup.patch @@ -1,4 +1,4 @@ -From 2e4bd0b8aa76d8ef7e056632f40ff60ef06cfa46 Mon Sep 17 00:00:00 2001 +From 0ccc24ded3499d4bdeddc7436596bc68a639446f Mon Sep 17 00:00:00 2001 From: simpleauthority Date: Tue, 28 May 2019 03:48:51 -0700 Subject: [PATCH] Implement CraftBlockSoundGroup @@ -6,7 +6,7 @@ Subject: [PATCH] Implement CraftBlockSoundGroup diff --git a/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java new file mode 100644 -index 000000000..99f99330d +index 0000000000..99f99330d0 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/block/CraftBlockSoundGroup.java @@ -0,0 +1,38 @@ @@ -49,7 +49,7 @@ index 000000000..99f99330d + } +} diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java -index c1ff62aa5..de4388165 100644 +index c1ff62aa52..de43881653 100644 --- a/src/main/java/net/minecraft/server/IBlockData.java +++ b/src/main/java/net/minecraft/server/IBlockData.java @@ -275,6 +275,7 @@ public class IBlockData extends BlockDataAbstract implements @@ -61,7 +61,7 @@ index c1ff62aa5..de4388165 100644 return this.getBlock().getStepSound(this); } diff --git a/src/main/java/net/minecraft/server/SoundEffectType.java b/src/main/java/net/minecraft/server/SoundEffectType.java -index b774d2d8d..0184bf3fc 100644 +index b774d2d8d9..0184bf3fc9 100644 --- a/src/main/java/net/minecraft/server/SoundEffectType.java +++ b/src/main/java/net/minecraft/server/SoundEffectType.java @@ -27,10 +27,10 @@ public class SoundEffectType { @@ -96,7 +96,7 @@ index b774d2d8d..0184bf3fc 100644 return this.D; } diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index fa840c3d3..a667e58ed 100644 +index fa840c3d38..a667e58ed2 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -697,4 +697,11 @@ public class CraftBlock implements Block { diff --git a/Spigot-Server-Patches/0379-Chunk-debug-command.patch b/Spigot-Server-Patches/0379-Chunk-debug-command.patch index 56fe035a2..1795d77a4 100644 --- a/Spigot-Server-Patches/0379-Chunk-debug-command.patch +++ b/Spigot-Server-Patches/0379-Chunk-debug-command.patch @@ -1,4 +1,4 @@ -From eb45d133eb10487b47f530501f6bb699d999fa8f Mon Sep 17 00:00:00 2001 +From f21f94bb91e6b5c4c5fcb51e0e73ea9eef9f2b17 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 1 Jun 2019 13:00:55 -0700 Subject: [PATCH] Chunk debug command @@ -32,7 +32,7 @@ https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlass https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index d704fc79c0..09efbf7250 100644 +index 5acad8e44f..af81098784 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -28,14 +28,14 @@ public class PaperCommand extends Command { @@ -185,7 +185,7 @@ index d704fc79c0..09efbf7250 100644 * Ported from MinecraftForge - author: LexManos - License: LGPLv2.1 */ diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index 71db32bddd..b18d07b760 100644 +index 96ac76c134..0db7b88bdd 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -22,7 +22,7 @@ import org.apache.logging.log4j.Logger; @@ -412,7 +412,7 @@ index c4bbee7d6a..b6d3870063 100644 private int dirtyCount; private int r; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 8c6cd4cd6e..7033d3a91f 100644 +index 5763538905..584bd24bbc 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -58,7 +58,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { diff --git a/Spigot-Server-Patches/0380-incremental-chunk-saving.patch b/Spigot-Server-Patches/0380-incremental-chunk-saving.patch index 298803a8d..e3d6d988c 100644 --- a/Spigot-Server-Patches/0380-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0380-incremental-chunk-saving.patch @@ -1,4 +1,4 @@ -From 086611b07ae16d7b852c8b64e448375d91e749ad Mon Sep 17 00:00:00 2001 +From 80e4c341779cc350d41323b5999f8a9e3466b5e8 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving @@ -175,7 +175,7 @@ index b6d3870063..66a389a67e 100644 public void a(ProtoChunkExtension protochunkextension) { for (int i = 0; i < this.statusFutures.length(); ++i) { diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 7033d3a91f..5c28ccc004 100644 +index 584bd24bbc..3712f495ff 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -331,6 +331,64 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -261,7 +261,7 @@ index 7033d3a91f..5c28ccc004 100644 return PlayerChunk.getChunkState(playerchunk.getTicketLevel()); }); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index f4ee20efd9..a7e7eb85ba 100644 +index 4ccc35d614..741d76967c 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -814,11 +814,44 @@ public class WorldServer extends World { @@ -319,5 +319,5 @@ index f4ee20efd9..a7e7eb85ba 100644 this.checkSession(); this.worldProvider.i(); -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch b/Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch index f480b76ba..c23a14d77 100644 --- a/Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch +++ b/Spigot-Server-Patches/0381-Catch-exceptions-from-dispenser-entity-spawns.patch @@ -1,11 +1,11 @@ -From 7a00be23974375fb5adb215f7d002b5cf8ee220d Mon Sep 17 00:00:00 2001 +From ad50f1fb2f72b4296313cc93fa2eea6c87f5227e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 10 Jun 2019 09:36:40 +0100 Subject: [PATCH] Catch exceptions from dispenser entity spawns diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index 5a8c4dc6b..b6b7e3c6c 100644 +index 5a8c4dc6ba..b6b7e3c6c9 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -163,7 +163,14 @@ public interface IDispenseBehavior { diff --git a/Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch b/Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch index e212cf4af..9226bef87 100644 --- a/Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch +++ b/Spigot-Server-Patches/0382-Fix-World-isChunkGenerated-calls.patch @@ -1,4 +1,4 @@ -From b611e2e03f3e4157a328243dbe2d9dc9d7040c5e Mon Sep 17 00:00:00 2001 +From 5b3af622326725cd97c9e82774308d0c4de5311a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 08:54:33 -0700 Subject: [PATCH] Fix World#isChunkGenerated calls diff --git a/Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch b/Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch index 1eafb9f21..f624b4895 100644 --- a/Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch +++ b/Spigot-Server-Patches/0383-Show-blockstate-location-if-we-failed-to-read-it.patch @@ -1,11 +1,11 @@ -From df5cb1dcc3109efd1acc8e83e944f9954a03d0bf Mon Sep 17 00:00:00 2001 +From 1ed157a45d625ae410cfb62bbd3e73b66dd2fbc3 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 15 Jun 2019 10:28:25 -0700 Subject: [PATCH] Show blockstate location if we failed to read it diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java -index f6401e2cd..3e22d558e 100644 +index f6401e2cde..3e22d558ea 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java @@ -19,6 +19,8 @@ public class CraftBlockEntityState extends CraftBlockState diff --git a/Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch b/Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch index 18144a5cf..20ec10258 100644 --- a/Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch +++ b/Spigot-Server-Patches/0384-Log-other-thread-in-DataPaletteBlock-lock-failure.patch @@ -1,4 +1,4 @@ -From 3913ac185140113d2fd545f6fcfb1131b4c28a0a Mon Sep 17 00:00:00 2001 +From 3520722457d35bfd4abfb320ca04c8729b163968 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 21 Jun 2019 14:42:48 -0700 Subject: [PATCH] Log other thread in DataPaletteBlock lock failure @@ -6,7 +6,7 @@ Subject: [PATCH] Log other thread in DataPaletteBlock lock failure diff --git a/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java new file mode 100644 -index 000000000..a3b174618 +index 0000000000..a3b174618d --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/util/ReentrantLockWithGetOwner.java @@ -0,0 +1,11 @@ @@ -22,7 +22,7 @@ index 000000000..a3b174618 + } +} diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java -index d5f5a5187..2c1d1b1a5 100644 +index d5f5a51872..2c1d1b1a55 100644 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java @@ -22,14 +22,17 @@ public class DataPaletteBlock implements DataPaletteExpandable { diff --git a/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch b/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch index 540062036..6178e84b2 100644 --- a/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch +++ b/Spigot-Server-Patches/0385-Use-ChunkStatus-cache-when-saving-protochunks.patch @@ -1,4 +1,4 @@ -From 5a2ef5a435dd994c2f40ebc52e853b53ccf07874 Mon Sep 17 00:00:00 2001 +From 5e741da63b4734810a9c9bfbd5828965cee2de0d Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 22 Jun 2019 04:20:47 -0700 Subject: [PATCH] Use ChunkStatus cache when saving protochunks diff --git a/Spigot-Server-Patches/0386-Anti-Xray.patch b/Spigot-Server-Patches/0386-Anti-Xray.patch index e633cf10b..6855c39ae 100644 --- a/Spigot-Server-Patches/0386-Anti-Xray.patch +++ b/Spigot-Server-Patches/0386-Anti-Xray.patch @@ -1,4 +1,4 @@ -From 4b9141bb031d1027dd96f30a430075a97acc6cf2 Mon Sep 17 00:00:00 2001 +From 395f055ec8659f673f6ac2c2f77e117c03b7f987 Mon Sep 17 00:00:00 2001 From: stonar96 Date: Mon, 20 Aug 2018 03:03:58 +0200 Subject: [PATCH] Anti-Xray diff --git a/Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch b/Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch index 113743692..c29e2ccfc 100644 --- a/Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch +++ b/Spigot-Server-Patches/0387-Only-count-Natural-Spawned-mobs-towards-natural-spaw.patch @@ -1,4 +1,4 @@ -From 628a1cdf2da8a0b4ca0f8904696d6c2377b7fa27 Mon Sep 17 00:00:00 2001 +From 988b4a05a083db3da33efdba123a6d330c532cea Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 01:01:32 -0400 Subject: [PATCH] Only count Natural Spawned mobs towards natural spawn mob @@ -38,7 +38,7 @@ index df24e3297b..4c50109365 100644 public boolean asynchronous; public EngineMode engineMode; diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a7e7eb85ba..85c96467c1 100644 +index 741d76967c..4b65a232ff 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -957,6 +957,13 @@ public class WorldServer extends World { @@ -56,5 +56,5 @@ index a7e7eb85ba..85c96467c1 100644 } } -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch b/Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch index 67374cf4e..77f8aa143 100644 --- a/Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch +++ b/Spigot-Server-Patches/0388-Configurable-projectile-relative-velocity.patch @@ -1,4 +1,4 @@ -From 12f33fd8c401fb7919401bb8e08802dd3c3612da Mon Sep 17 00:00:00 2001 +From df08dc112e0d5250d40584be973c83c8e58ee7bf Mon Sep 17 00:00:00 2001 From: Lucavon Date: Tue, 23 Jul 2019 20:29:20 -0500 Subject: [PATCH] Configurable projectile relative velocity @@ -25,7 +25,7 @@ P3) Solutions for 1) and especially 2) might not be future-proof, while this server-internal fix makes this change future-proof. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 4c5010936..a09282e00 100644 +index 4c50109365..a09282e00e 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -555,4 +555,9 @@ public class PaperWorldConfig { @@ -39,7 +39,7 @@ index 4c5010936..a09282e00 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java -index 634e2bd30..9c97edf9c 100644 +index 634e2bd304..9c97edf9c9 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -85,7 +85,7 @@ public abstract class EntityArrow extends Entity implements IProjectile { @@ -52,7 +52,7 @@ index 634e2bd30..9c97edf9c 100644 @Override diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java -index 6c091b680..f5c8074dc 100644 +index 6c091b6808..f5c8074dcf 100644 --- a/src/main/java/net/minecraft/server/EntityProjectile.java +++ b/src/main/java/net/minecraft/server/EntityProjectile.java @@ -43,7 +43,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile { diff --git a/Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch b/Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch index 71002e1bc..94ebdbeb4 100644 --- a/Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch +++ b/Spigot-Server-Patches/0389-Mark-entities-as-being-ticked-when-notifying-navigat.patch @@ -1,4 +1,4 @@ -From 9b623f17303e524e3d3d61b6bfe53ad88a94cee7 Mon Sep 17 00:00:00 2001 +From e13217dabc3ea14bc352d1da77110ec7c82a4a0d Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 28 Jul 2019 00:51:11 +0100 Subject: [PATCH] Mark entities as being ticked when notifying navigation diff --git a/Spigot-Server-Patches/0390-offset-item-frame-ticking.patch b/Spigot-Server-Patches/0390-offset-item-frame-ticking.patch index b7a496779..38c9b1da0 100644 --- a/Spigot-Server-Patches/0390-offset-item-frame-ticking.patch +++ b/Spigot-Server-Patches/0390-offset-item-frame-ticking.patch @@ -1,11 +1,11 @@ -From 66eec83809d55a892497e3be551e67febd917569 Mon Sep 17 00:00:00 2001 +From 34782a9ff535618847d62da25b61e6f896741c69 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Tue, 30 Jul 2019 03:17:16 +0500 Subject: [PATCH] offset item frame ticking diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java -index 21dbc9b2a..ef9c4717c 100644 +index 21dbc9b2ab..ef9c4717c3 100644 --- a/src/main/java/net/minecraft/server/EntityHanging.java +++ b/src/main/java/net/minecraft/server/EntityHanging.java @@ -15,7 +15,7 @@ public abstract class EntityHanging extends Entity { diff --git a/Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch b/Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch index b1cf16d2d..7653537f8 100644 --- a/Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch +++ b/Spigot-Server-Patches/0391-Avoid-hopper-searches-if-there-are-no-items.patch @@ -1,4 +1,4 @@ -From 8eb689794cfdff5e32ffdb94055b5924daefee91 Mon Sep 17 00:00:00 2001 +From f78f01f3686c8be41b0a1a5dae5f08f269db99c5 Mon Sep 17 00:00:00 2001 From: CullanP Date: Thu, 3 Mar 2016 02:13:38 -0600 Subject: [PATCH] Avoid hopper searches if there are no items @@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear Combined, this adds up a lot. diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java -index 06b4dc628..fc01aa68e 100644 +index 06b4dc6284..fc01aa68eb 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -84,6 +84,10 @@ public class Chunk implements IChunkAccess { @@ -85,7 +85,7 @@ index 06b4dc628..fc01aa68e 100644 T t0 = (T) iterator.next(); // CraftBukkit - decompile error if (t0.shouldBeRemoved) continue; // Paper diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java -index 498f38109..a2d1ef360 100644 +index 498f381099..a2d1ef3602 100644 --- a/src/main/java/net/minecraft/server/IEntitySelector.java +++ b/src/main/java/net/minecraft/server/IEntitySelector.java @@ -11,6 +11,7 @@ public final class IEntitySelector { diff --git a/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch b/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch index de26057ae..572a60c9e 100644 --- a/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch +++ b/Spigot-Server-Patches/0392-Asynchronous-chunk-IO-and-loading.patch @@ -1,4 +1,4 @@ -From 15632e42c5acd8eb21842ba8e11ceae589e4ae5b Mon Sep 17 00:00:00 2001 +From cbcdb57187511c075ce0b1f4ba3add4d57aad890 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 13 Jul 2019 09:23:10 -0700 Subject: [PATCH] Asynchronous chunk IO and loading diff --git a/Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch b/Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch index dc18f4190..46a85f1ed 100644 --- a/Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch +++ b/Spigot-Server-Patches/0393-Use-getChunkIfLoadedImmediately-in-places.patch @@ -1,4 +1,4 @@ -From 29199995fd17dcc6ce4757218ccbf95ad9f0478d Mon Sep 17 00:00:00 2001 +From 02df6715408780bb9eac36e0bddbc2ef96130626 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 8 Jul 2019 00:13:36 -0700 Subject: [PATCH] Use getChunkIfLoadedImmediately in places diff --git a/Spigot-Server-Patches/0394-Reduce-sync-loads.patch b/Spigot-Server-Patches/0394-Reduce-sync-loads.patch index 046fa1320..746bea090 100644 --- a/Spigot-Server-Patches/0394-Reduce-sync-loads.patch +++ b/Spigot-Server-Patches/0394-Reduce-sync-loads.patch @@ -1,4 +1,4 @@ -From 80c6f7c2556cf280ee87cb98f47ece177c65f681 Mon Sep 17 00:00:00 2001 +From 8b1900b6e3b872b5d0b8c83827515de8756e930a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 19 Jul 2019 03:29:14 -0700 Subject: [PATCH] Reduce sync loads @@ -11,7 +11,7 @@ it must be enabled by setting the startup flag -Dpaper.debug-sync-loads=true To get a debug log for sync loads, the command is /paper syncloadinfo diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java -index 09efbf725..132397b3f 100644 +index af81098784..dfe92780ad 100644 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java @@ -1,9 +1,13 @@ @@ -91,7 +91,7 @@ index 09efbf725..132397b3f 100644 if (args.length < 2 || args[1].equals("*")) { diff --git a/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java new file mode 100644 -index 000000000..59aec1032 +index 0000000000..59aec10329 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/io/SyncLoadFinder.java @@ -0,0 +1,172 @@ @@ -268,7 +268,7 @@ index 000000000..59aec1032 + } +} diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index eb9bf1516..0745ab75a 100644 +index 03d7ce8294..eb4bc66bce 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -378,6 +378,7 @@ public class ChunkProviderServer extends IChunkProvider { @@ -280,7 +280,7 @@ index eb9bf1516..0745ab75a 100644 this.serverThreadQueue.awaitTasks(completablefuture::isDone); com.destroystokyo.paper.io.chunk.ChunkTaskManager.popChunkWait(); // Paper - async chunk debug diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 61829b3bf..1cbd50450 100644 +index 61829b3bf9..1cbd50450d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1171,7 +1171,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable { @@ -311,7 +311,7 @@ index 61829b3bf..1cbd50450 100644 if (chunk != null) { chunk.a(oclass, axisalignedbb, list, predicate); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 6506daeec..26d1303dd 100644 +index d4ef2403d5..7088dbf6a2 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -154,6 +154,12 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch b/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch index 6a75a8c84..9ec774313 100644 --- a/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch +++ b/Spigot-Server-Patches/0395-Implement-alternative-item-despawn-rate.patch @@ -1,11 +1,11 @@ -From 3efaa15b531e2ec68342392b9eca081955e7d229 Mon Sep 17 00:00:00 2001 +From b6baed69504752bc3b904ca9e085dce23cfe78f5 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 3 Jun 2019 02:02:39 -0400 Subject: [PATCH] Implement alternative item-despawn-rate diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index a09282e00..9d9260ad0 100644 +index a09282e00e..9d9260ad07 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -1,12 +1,17 @@ @@ -80,7 +80,7 @@ index a09282e00..9d9260ad0 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index ef2cf6565..507627a29 100644 +index ef2cf6565b..507627a29f 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -6,6 +6,7 @@ import java.util.Objects; diff --git a/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch b/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch index cfa314138..4c5972d82 100644 --- a/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch +++ b/Spigot-Server-Patches/0396-Do-less-work-if-we-have-a-custom-Bukkit-generator.patch @@ -1,4 +1,4 @@ -From 134bd0bfaa6b263d23a95138710d5817ed8a216f Mon Sep 17 00:00:00 2001 +From 7656819871f3bf85bbabcd0dc304de0a9395c5f2 Mon Sep 17 00:00:00 2001 From: Paul Sauve Date: Sun, 14 Jul 2019 21:05:03 -0500 Subject: [PATCH] Do less work if we have a custom Bukkit generator @@ -7,7 +7,7 @@ If the Bukkit generator already has a spawn, use it immediately instead of spending time generating one that we won't use diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 659044ffe8..0b236f0903 100644 +index 7088dbf6a2..08e9444fad 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -811,12 +811,13 @@ public class WorldServer extends World { @@ -45,5 +45,5 @@ index 659044ffe8..0b236f0903 100644 WorldServer.LOGGER.warn("Unable to find spawn biome"); } -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0397-Fix-MC-158900.patch b/Spigot-Server-Patches/0397-Fix-MC-158900.patch index 626f6890c..9af4b2223 100644 --- a/Spigot-Server-Patches/0397-Fix-MC-158900.patch +++ b/Spigot-Server-Patches/0397-Fix-MC-158900.patch @@ -1,4 +1,4 @@ -From 5dd6629241a531c0b75dd47db0226298e69e7be8 Mon Sep 17 00:00:00 2001 +From 3bffd97ff78312d40deee2f861d9bdf0fa48e35c Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 13 Aug 2019 06:35:17 -0700 Subject: [PATCH] Fix MC-158900 @@ -7,7 +7,7 @@ The problem was we were checking isExpired() on the entry, but if it was expired at that point, then it would be null. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 68e089a4b..f702619aa 100644 +index 68e089a4b6..f702619aa2 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -513,8 +513,10 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch b/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch index 11cc24ba3..f07358a08 100644 --- a/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch +++ b/Spigot-Server-Patches/0398-implement-optional-per-player-mob-spawns.patch @@ -1,4 +1,4 @@ -From 5955d672a70dc9a15e74f2d7f661bdc9b5618ceb Mon Sep 17 00:00:00 2001 +From a44b0cbdb1f82a9f0b9cda228ed70be91d281827 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 01:27:58 +0500 Subject: [PATCH] implement optional per player mob spawns @@ -643,7 +643,7 @@ index 79f8549660..4100e367a4 100644 return this.bb; } diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index a3271d6c28..57bea926a6 100644 +index 893c542f57..09440fffb5 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -78,7 +78,8 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -755,7 +755,7 @@ index fdac5bb3a2..58bbf2f9d2 100644 @Nullable diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 0b236f0903..95ff177efb 100644 +index 08e9444fad..1b823bcc08 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -1028,7 +1028,20 @@ public class WorldServer extends World { @@ -800,5 +800,5 @@ index 0b236f0903..95ff177efb 100644 @Override -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch b/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch index d3cc7b770..14a1f1e52 100644 --- a/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch +++ b/Spigot-Server-Patches/0399-Prevent-consuming-the-wrong-itemstack.patch @@ -1,11 +1,11 @@ -From e2730bf2ef41ac57940c626d2db7acd3007f0a42 Mon Sep 17 00:00:00 2001 +From 7308ea37d709dcfe69c85d3c87113c4f851c0dab Mon Sep 17 00:00:00 2001 From: kickash32 Date: Mon, 19 Aug 2019 19:42:35 +0500 Subject: [PATCH] Prevent consuming the wrong itemstack diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index af79b6e37..b098cd6d7 100644 +index af79b6e378..b098cd6d77 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -2893,10 +2893,13 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch b/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch index ac66a8fe6..8e8176228 100644 --- a/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch +++ b/Spigot-Server-Patches/0400-only-add-passanger-entities-once-from-spawners.patch @@ -1,11 +1,11 @@ -From 27e07b128da5857600cdbe16f6c8275fc86cd91a Mon Sep 17 00:00:00 2001 +From 15089fad66207986bd6e4c8d5c13e2703257c2f9 Mon Sep 17 00:00:00 2001 From: kickash32 Date: Wed, 21 Aug 2019 23:57:32 +0500 Subject: [PATCH] only add passanger entities once from spawners diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java -index 41001b02a..df494d37b 100644 +index 41001b02a6..df494d37be 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java @@ -196,7 +196,7 @@ public abstract class MobSpawnerAbstract { diff --git a/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch b/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch index 3d6e12b0c..60979d8a1 100644 --- a/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch +++ b/Spigot-Server-Patches/0401-Fix-nether-portal-creation.patch @@ -1,11 +1,11 @@ -From 4a38dc13b8c72b2415342056a1896281b5041c9e Mon Sep 17 00:00:00 2001 +From 5945813c901ff9b1ad210e730722daba084c3860 Mon Sep 17 00:00:00 2001 From: Michael Himing Date: Mon, 9 Sep 2019 13:21:17 +1000 Subject: [PATCH] Fix nether portal creation diff --git a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java -index 60330f753..c22dbbfbe 100644 +index 60330f753f..c22dbbfbe8 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java +++ b/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java @@ -38,6 +38,11 @@ public class BlockStateListPopulator extends DummyGeneratorAccess { diff --git a/Spigot-Server-Patches/0402-Generator-Settings.patch b/Spigot-Server-Patches/0402-Generator-Settings.patch index 1bfd52f02..332c2e8dc 100644 --- a/Spigot-Server-Patches/0402-Generator-Settings.patch +++ b/Spigot-Server-Patches/0402-Generator-Settings.patch @@ -1,11 +1,11 @@ -From 124265b64e81c925b22f080b951e34379b0f81a8 Mon Sep 17 00:00:00 2001 +From 4aed92cee22e319f384a427bd5c5c1673ae385e6 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Wed, 2 Mar 2016 02:17:54 -0600 Subject: [PATCH] Generator Settings diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index fd3dbea62..e790326c9 100644 +index fd3dbea628..e790326c9c 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -618,4 +618,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index fd3dbea62..e790326c9 100644 + } } diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java -index af81a8414..2268fbdd8 100644 +index af81a84142..2268fbdd87 100644 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java @@ -211,8 +211,8 @@ public abstract class ChunkGeneratorAbstract diff --git a/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch b/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch index 5cd4bddfd..e322bb3d8 100644 --- a/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch +++ b/Spigot-Server-Patches/0403-Fix-zero-tick-instant-grow-farms-MC-113809.patch @@ -1,4 +1,4 @@ -From b14ef74258c813383400b99259c19e9087de9dbf Mon Sep 17 00:00:00 2001 +From 9642fa9a93c2e513dab17a997e7f019bb34ee2c2 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sun, 15 Sep 2019 11:32:32 -0500 Subject: [PATCH] Fix zero-tick instant grow farms MC-113809 @@ -81,7 +81,7 @@ index 55b07444e1..3bc3c5aa29 100644 for (i = 1; worldserver.getType(blockposition.down(i)).getBlock() == this; ++i) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b7b5640663..ed4c3d9da2 100644 +index 1b823bcc08..3d5a0f0a03 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -589,7 +589,9 @@ public class WorldServer extends World { @@ -95,5 +95,5 @@ index b7b5640663..ed4c3d9da2 100644 Fluid fluid = iblockdata.getFluid(); -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0404-Fix-MC-161754.patch b/Spigot-Server-Patches/0404-Fix-MC-161754.patch index 09b6ee7c7..1bcdc9020 100644 --- a/Spigot-Server-Patches/0404-Fix-MC-161754.patch +++ b/Spigot-Server-Patches/0404-Fix-MC-161754.patch @@ -1,4 +1,4 @@ -From f82bf0b1eb94718523fdc9e10a907e019191e99a Mon Sep 17 00:00:00 2001 +From e34bb48d8cefd150e384790e6128c08b11bde7d5 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 24 Sep 2019 16:03:00 -0700 Subject: [PATCH] Fix MC-161754 @@ -9,7 +9,7 @@ We can use an entity valid check since this method is invoked for each inventory iteraction (thanks to CB) and on player tick (vanilla). diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java -index c95ce0124..18e1ae7f0 100644 +index c95ce0124d..18e1ae7f0a 100644 --- a/src/main/java/net/minecraft/server/ContainerHorse.java +++ b/src/main/java/net/minecraft/server/ContainerHorse.java @@ -76,7 +76,7 @@ public class ContainerHorse extends Container { diff --git a/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch b/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch index 9f4dd319e..3fee29e68 100644 --- a/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch +++ b/Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch @@ -1,4 +1,4 @@ -From b799154bf7e4dc77d22a6f0c260b18261b36db75 Mon Sep 17 00:00:00 2001 +From db61d8ce7b1c103a0ba6b74b48a06f27e3d1d99d Mon Sep 17 00:00:00 2001 From: wea_ondara Date: Thu, 10 Oct 2019 11:29:42 +0200 Subject: [PATCH] Performance improvement for Chunk.getEntities @@ -10,7 +10,7 @@ operation. This patch will reduce the load of plugins which for example implement custom moblimits and depend on Chunk.getEntities(). diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java -index 91f2066b1..9cff8b88b 100644 +index 91f2066b12..9cff8b88ba 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -112,14 +112,14 @@ public class CraftChunk implements Chunk { diff --git a/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch b/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch index 8defb1601..d6ef480ce 100644 --- a/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch +++ b/Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch @@ -1,4 +1,4 @@ -From 72aba67024744cb9608ae2e5fcb860d7ad9d93c3 Mon Sep 17 00:00:00 2001 +From d055e05bdd02b20d1d2b1266787f428a8527c3df Mon Sep 17 00:00:00 2001 From: MisterErwin Date: Wed, 30 Oct 2019 16:57:54 +0100 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and @@ -24,5 +24,5 @@ index 1d275520fb..051506fce8 100644 for (BlockFace dir : faces) { IBlockData nmsBlock = world.getType(pos.shift(CraftBlock.blockFaceToNotch(dir))); -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch b/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch index 305d0acf2..158a12b79 100644 --- a/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch +++ b/Spigot-Server-Patches/0407-Expose-the-internal-current-tick.patch @@ -1,11 +1,11 @@ -From 556965a2437fc96aa412272fe44c893e6e9ba411 Mon Sep 17 00:00:00 2001 +From da367fd5acb5812bd97c4396986a55fca6c9f312 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 20 Apr 2019 19:47:34 -0500 Subject: [PATCH] Expose the internal current tick diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 0df49581f..b9a398bc5 100644 +index 0df49581fb..b9a398bc57 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -2202,5 +2202,10 @@ public final class CraftServer implements Server { diff --git a/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch b/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch index ccfe44224..868476b0e 100644 --- a/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch +++ b/Spigot-Server-Patches/0408-Fix-stuck-in-sneak-when-changing-worlds-MC-10657.patch @@ -1,11 +1,11 @@ -From 9943514590953f7666e925497d56484fe9c8c377 Mon Sep 17 00:00:00 2001 +From 5b5deacf62e8846d423a59a9663fbad3d338a19f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:51:43 -0500 Subject: [PATCH] Fix stuck in sneak when changing worlds (MC-10657) diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 07a2310b1..cb795aa73 100644 +index 07a2310b18..cb795aa733 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -982,6 +982,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -18,7 +18,7 @@ index 07a2310b1..cb795aa73 100644 PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver.getWorld()); this.world.getServer().getPluginManager().callEvent(changeEvent); diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index f702619aa..7b79ee4fe 100644 +index f702619aa2..7b79ee4fe5 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -729,6 +729,8 @@ public abstract class PlayerList { diff --git a/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch b/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch index 5b8bc0254..23198578f 100644 --- a/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch +++ b/Spigot-Server-Patches/0409-Add-option-to-disable-pillager-patrols.patch @@ -1,11 +1,11 @@ -From e40f7304001ea67cdf92528a997ddedf747d9f31 Mon Sep 17 00:00:00 2001 +From e572bfa9a239f981e4d298d0650fcdfa241944ba Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 9 Oct 2019 21:46:15 -0500 Subject: [PATCH] Add option to disable pillager patrols diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index c37a0f035..3bbf77a8e 100644 +index c37a0f035d..3bbf77a8ec 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -628,4 +628,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index c37a0f035..3bbf77a8e 100644 + } } diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index 33488b37e..a0f582807 100644 +index 33488b37e4..a0f5828076 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java @@ -9,6 +9,7 @@ public class MobSpawnerPatrol { diff --git a/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch b/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch index bce8f8d81..63ecd06d8 100644 --- a/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch +++ b/Spigot-Server-Patches/0410-Fix-AssertionError-when-player-hand-set-to-empty-typ.patch @@ -1,4 +1,4 @@ -From 7ea8b1cf227b24937a9dd217110fc1fad1b5e0cd Mon Sep 17 00:00:00 2001 +From 21f8797ce8ad59efb6af642edb535963e3ac6aa4 Mon Sep 17 00:00:00 2001 From: Lukasz Derlatka Date: Mon, 11 Nov 2019 16:08:13 +0100 Subject: [PATCH] Fix AssertionError when player hand set to empty type @@ -7,7 +7,7 @@ Fixes an AssertionError when setting the player's item in hand to null or a new Fixes GH-2718 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index b098cd6d7..6184cced7 100644 +index b098cd6d77..6184cced73 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1888,6 +1888,7 @@ public abstract class EntityLiving extends Entity { @@ -19,7 +19,7 @@ index b098cd6d7..6184cced7 100644 if (enumhand == EnumHand.MAIN_HAND) { return this.getEquipment(EnumItemSlot.MAINHAND); diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index f88bcb29d..108377d76 100644 +index f88bcb29db..108377d76e 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java @@ -1430,6 +1430,10 @@ public class PlayerConnection implements PacketListenerPlayIn { diff --git a/Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch b/Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch index f5586d2da..ee680a961 100644 --- a/Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch +++ b/Spigot-Server-Patches/0411-PlayerLaunchProjectileEvent.patch @@ -1,11 +1,11 @@ -From d05f19a6ddbd9a7012a42a1da9ff2fffec84c61d Mon Sep 17 00:00:00 2001 +From a4dc5c42909b4ea232dcb14bab10f40606096a83 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 21 Jul 2018 03:11:03 -0500 Subject: [PATCH] PlayerLaunchProjectileEvent diff --git a/src/main/java/net/minecraft/server/InteractionResultWrapper.java b/src/main/java/net/minecraft/server/InteractionResultWrapper.java -index 5cab47a28..886babdcd 100644 +index 5cab47a282..886babdcda 100644 --- a/src/main/java/net/minecraft/server/InteractionResultWrapper.java +++ b/src/main/java/net/minecraft/server/InteractionResultWrapper.java @@ -10,6 +10,7 @@ public class InteractionResultWrapper { @@ -17,7 +17,7 @@ index 5cab47a28..886babdcd 100644 return this.a; } diff --git a/src/main/java/net/minecraft/server/ItemEgg.java b/src/main/java/net/minecraft/server/ItemEgg.java -index 6fccd70a0..16f1b734e 100644 +index 6fccd70a03..16f1b734e0 100644 --- a/src/main/java/net/minecraft/server/ItemEgg.java +++ b/src/main/java/net/minecraft/server/ItemEgg.java @@ -16,21 +16,35 @@ public class ItemEgg extends Item { @@ -61,7 +61,7 @@ index 6fccd70a0..16f1b734e 100644 return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemEnderPearl.java b/src/main/java/net/minecraft/server/ItemEnderPearl.java -index cab869e8e..b57e9f7e7 100644 +index cab869e8e9..b57e9f7e72 100644 --- a/src/main/java/net/minecraft/server/ItemEnderPearl.java +++ b/src/main/java/net/minecraft/server/ItemEnderPearl.java @@ -16,22 +16,37 @@ public class ItemEnderPearl extends Item { @@ -113,7 +113,7 @@ index cab869e8e..b57e9f7e7 100644 return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemExpBottle.java b/src/main/java/net/minecraft/server/ItemExpBottle.java -index 071688b3a..1d575af52 100644 +index 071688b3ab..1d575af526 100644 --- a/src/main/java/net/minecraft/server/ItemExpBottle.java +++ b/src/main/java/net/minecraft/server/ItemExpBottle.java @@ -15,19 +15,38 @@ public class ItemExpBottle extends Item { @@ -158,7 +158,7 @@ index 071688b3a..1d575af52 100644 return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemLingeringPotion.java b/src/main/java/net/minecraft/server/ItemLingeringPotion.java -index c19b678cf..7672e31fc 100644 +index c19b678cfb..7672e31fc0 100644 --- a/src/main/java/net/minecraft/server/ItemLingeringPotion.java +++ b/src/main/java/net/minecraft/server/ItemLingeringPotion.java @@ -8,7 +8,11 @@ public class ItemLingeringPotion extends ItemPotionThrowable { @@ -176,7 +176,7 @@ index c19b678cf..7672e31fc 100644 } } diff --git a/src/main/java/net/minecraft/server/ItemPotionThrowable.java b/src/main/java/net/minecraft/server/ItemPotionThrowable.java -index 5d1f118c5..d1beab1ab 100644 +index 5d1f118c51..d1beab1ab7 100644 --- a/src/main/java/net/minecraft/server/ItemPotionThrowable.java +++ b/src/main/java/net/minecraft/server/ItemPotionThrowable.java @@ -15,13 +15,31 @@ public class ItemPotionThrowable extends ItemPotion { @@ -213,7 +213,7 @@ index 5d1f118c5..d1beab1ab 100644 return InteractionResultWrapper.success(itemstack); } diff --git a/src/main/java/net/minecraft/server/ItemSnowball.java b/src/main/java/net/minecraft/server/ItemSnowball.java -index 56ec50895..e6044e654 100644 +index 56ec508959..e6044e654b 100644 --- a/src/main/java/net/minecraft/server/ItemSnowball.java +++ b/src/main/java/net/minecraft/server/ItemSnowball.java @@ -17,19 +17,27 @@ public class ItemSnowball extends Item { @@ -251,7 +251,7 @@ index 56ec50895..e6044e654 100644 /* if (!entityhuman.abilities.canInstantlyBuild) { diff --git a/src/main/java/net/minecraft/server/ItemSplashPotion.java b/src/main/java/net/minecraft/server/ItemSplashPotion.java -index 18bd846ce..e71e933ff 100644 +index 18bd846cee..e71e933fff 100644 --- a/src/main/java/net/minecraft/server/ItemSplashPotion.java +++ b/src/main/java/net/minecraft/server/ItemSplashPotion.java @@ -8,7 +8,11 @@ public class ItemSplashPotion extends ItemPotionThrowable { diff --git a/Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch index 22c462d2a..8e1e1151a 100644 --- a/Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch +++ b/Spigot-Server-Patches/0412-Add-CraftMagicNumbers.isSupportedApiVersion.patch @@ -1,11 +1,11 @@ -From 8cc5c96e8be94d4f619858a86e18ec7b15527a0e Mon Sep 17 00:00:00 2001 +From f07120150be02845ba7a14230069da801f4a2572 Mon Sep 17 00:00:00 2001 From: BlackHole Date: Sun, 15 Dec 2019 19:12:39 +0100 Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion() diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index b1e1b59d4..770375ed4 100644 +index b1e1b59d45..770375ed42 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -308,6 +308,11 @@ public final class CraftMagicNumbers implements UnsafeValues { diff --git a/Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch b/Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch index 0017e2343..f32861d98 100644 --- a/Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch +++ b/Spigot-Server-Patches/0413-Prevent-sync-chunk-loads-when-villagers-try-to-find-.patch @@ -1,11 +1,11 @@ -From 326a5f98339073c75535437c63691728a83c3630 Mon Sep 17 00:00:00 2001 +From e9ac1c4a7bdece5b499fa30cfe7fd0ff613e7abb Mon Sep 17 00:00:00 2001 From: Callahan Date: Mon, 13 Jan 2020 23:47:28 -0600 Subject: [PATCH] Prevent sync chunk loads when villagers try to find beds diff --git a/src/main/java/net/minecraft/server/BehaviorSleep.java b/src/main/java/net/minecraft/server/BehaviorSleep.java -index fa575dde1..dfe0f6650 100644 +index fa575dde19..dfe0f66500 100644 --- a/src/main/java/net/minecraft/server/BehaviorSleep.java +++ b/src/main/java/net/minecraft/server/BehaviorSleep.java @@ -31,7 +31,8 @@ public class BehaviorSleep extends Behavior { diff --git a/Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch b/Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch index e4d76a0e9..09a9a4216 100644 --- a/Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch +++ b/Spigot-Server-Patches/0414-Fix-spawn-radius-being-treated-as-0.patch @@ -1,11 +1,11 @@ -From 13f92e5f465a38c37807942ea86010ebd141a13e Mon Sep 17 00:00:00 2001 +From cf4451063f1210acedb01773eb1aa2ff6968dce1 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 15 Dec 2019 19:41:28 +0000 Subject: [PATCH] Fix spawn radius being treated as 0 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index cb795aa73..69a422890 100644 +index cb795aa733..69a4228908 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -129,7 +129,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch b/Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch index b018b8cac..c70ec7a73 100644 --- a/Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch +++ b/Spigot-Server-Patches/0415-MC-145656-Fix-Follow-Range-Initial-Target.patch @@ -1,11 +1,11 @@ -From 3ad2d2634955c52214dac9fa92cd8e8bac8062a8 Mon Sep 17 00:00:00 2001 +From 50c525844c440587c3d5db2156496ff5e735769c Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 18 Dec 2019 22:21:35 -0600 Subject: [PATCH] MC-145656 Fix Follow Range Initial Target diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3bbf77a8e..f8d8cb865 100644 +index 3bbf77a8ec..f8d8cb8655 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -633,4 +633,9 @@ public class PaperWorldConfig { @@ -19,7 +19,7 @@ index 3bbf77a8e..f8d8cb865 100644 + } } diff --git a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java -index cd17bf2be..b85e67a85 100644 +index cd17bf2be5..b85e67a85d 100644 --- a/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java +++ b/src/main/java/net/minecraft/server/PathfinderGoalNearestAttackableTarget.java @@ -25,6 +25,7 @@ public class PathfinderGoalNearestAttackableTarget exten @@ -31,7 +31,7 @@ index cd17bf2be..b85e67a85 100644 @Override diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java -index c76a43837..e35ec2db0 100644 +index c76a43837b..e35ec2db07 100644 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java @@ -80,7 +80,7 @@ public class PathfinderTargetCondition { diff --git a/Spigot-Server-Patches/0416-Optimize-Hoppers.patch b/Spigot-Server-Patches/0416-Optimize-Hoppers.patch index b58d54eaf..ab97e4f3c 100644 --- a/Spigot-Server-Patches/0416-Optimize-Hoppers.patch +++ b/Spigot-Server-Patches/0416-Optimize-Hoppers.patch @@ -1,4 +1,4 @@ -From 33c72229b3f3a008267c5a74f800962395c77cb7 Mon Sep 17 00:00:00 2001 +From 911e27555a901f53c5bc34176e127b8808e5daa0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index f8d8cb865..3b8488d3f 100644 +index f8d8cb8655..3b8488d3ff 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -638,4 +638,13 @@ public class PaperWorldConfig { @@ -29,7 +29,7 @@ index f8d8cb865..3b8488d3f 100644 + } } diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java -index d953cdef1..d6e43313b 100644 +index d953cdef14..d6e43313bf 100644 --- a/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java @@ -482,11 +482,12 @@ public final class ItemStack { @@ -49,7 +49,7 @@ index d953cdef1..d6e43313b 100644 itemstack.d(this.C()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index baeaf772b..346664cee 100644 +index baeaf772be..346664cee0 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1225,6 +1225,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant { return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager()); diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java -index 958279249..a8e64dfda 100644 +index 958279249f..a8e64dfdab 100644 --- a/src/main/java/net/minecraft/server/TileEntity.java +++ b/src/main/java/net/minecraft/server/TileEntity.java @@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper @@ -81,7 +81,7 @@ index 958279249..a8e64dfda 100644 this.world.b(this.position, this); if (!this.c.isAir()) { diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java -index 907d088c8..4afd33a49 100644 +index 907d088c86..4afd33a491 100644 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java @@ -168,6 +168,160 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi diff --git a/Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch b/Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch index d0c4031f8..fa87ad676 100644 --- a/Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch +++ b/Spigot-Server-Patches/0417-PlayerDeathEvent-shouldDropExperience.patch @@ -1,11 +1,11 @@ -From 38a8f92216b4bce9bd7f01290af138cb0e76aae2 Mon Sep 17 00:00:00 2001 +From f331bf391d0495a17ebe7710c2ba75c57233259e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 24 Dec 2019 00:35:42 +0000 Subject: [PATCH] PlayerDeathEvent#shouldDropExperience diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 69a422890..e7bfbc330 100644 +index 69a4228908..e7bfbc3307 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -645,7 +645,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch b/Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch index 3be44dbf5..2afbdee33 100644 --- a/Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch +++ b/Spigot-Server-Patches/0418-Prevent-bees-loading-chunks-checking-hive-position.patch @@ -1,11 +1,11 @@ -From 8b7fed9a4ba0d46370730fdaa2ef544f0aacc83b Mon Sep 17 00:00:00 2001 +From 6d561399f8b39b4f67d3954edf09a016ef68029b Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 5 Jan 2020 17:24:34 -0600 Subject: [PATCH] Prevent bees loading chunks checking hive position diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index b39599654..73e016257 100644 +index b39599654e..73e0162578 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -386,6 +386,7 @@ public class EntityBee extends EntityAnimal implements EntityBird { diff --git a/Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch b/Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch index e3686346f..7fff88f1f 100644 --- a/Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch +++ b/Spigot-Server-Patches/0419-Don-t-load-Chunks-from-Hoppers-and-other-things.patch @@ -1,4 +1,4 @@ -From 7776a06028d95b1840c7008f1545de7bbcd62b0f Mon Sep 17 00:00:00 2001 +From c28c84eb3d7ad3354b88a6a37d82175886ea1dab Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Nov 2016 20:28:12 -0400 Subject: [PATCH] Don't load Chunks from Hoppers and other things @@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary" and treat it as a single chest if the other sides are unloaded diff --git a/src/main/java/net/minecraft/server/DoubleBlockFinder.java b/src/main/java/net/minecraft/server/DoubleBlockFinder.java -index 3cb6e6089..7a16a3e0e 100644 +index 3cb6e60895..7a16a3e0e2 100644 --- a/src/main/java/net/minecraft/server/DoubleBlockFinder.java +++ b/src/main/java/net/minecraft/server/DoubleBlockFinder.java @@ -21,8 +21,12 @@ public class DoubleBlockFinder { diff --git a/Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch b/Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch index 606f0e37e..cac26b3b3 100644 --- a/Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch +++ b/Spigot-Server-Patches/0420-Guard-against-serializing-mismatching-chunk-coordina.patch @@ -1,4 +1,4 @@ -From a5b28d5c17c8261410ccf253c9509a84ed400502 Mon Sep 17 00:00:00 2001 +From 539334aa6023e765089a038d32526ad711ea849e Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 27 Dec 2019 09:42:26 -0800 Subject: [PATCH] Guard against serializing mismatching chunk coordinate @@ -6,7 +6,7 @@ Subject: [PATCH] Guard against serializing mismatching chunk coordinate Should help if something dumb happens diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java -index 26f1a4b09..4349d22cc 100644 +index 26f1a4b095..4349d22cc8 100644 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java @@ -23,6 +23,13 @@ public class ChunkRegionLoader { @@ -35,7 +35,7 @@ index 26f1a4b09..4349d22cc 100644 if (!Objects.equals(chunkcoordintpair, chunkcoordintpair1)) { ChunkRegionLoader.LOGGER.error("Chunk file at {} is in the wrong location; relocating. (Expected {}, got {})", chunkcoordintpair, chunkcoordintpair, chunkcoordintpair1); diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java -index 134c76065..25c8b131f 100644 +index 134c76065b..25c8b131fe 100644 --- a/src/main/java/net/minecraft/server/IChunkLoader.java +++ b/src/main/java/net/minecraft/server/IChunkLoader.java @@ -106,6 +106,13 @@ public class IChunkLoader extends RegionFileCache implements AutoCloseable { diff --git a/Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch b/Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch index fc10c4ff7..6f462d892 100644 --- a/Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch +++ b/Spigot-Server-Patches/0421-Optimise-IEntityAccess-getPlayerByUUID.patch @@ -1,4 +1,4 @@ -From 89cf96a0b2e672a0a03b0194767d3f87c2ef8b17 Mon Sep 17 00:00:00 2001 +From 831fe8a7ae7ea10450845bbfdc2a762e7ed5547f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 11 Jan 2020 21:50:56 -0800 Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID @@ -6,7 +6,7 @@ Subject: [PATCH] Optimise IEntityAccess#getPlayerByUUID Use the world entity map instead of iterating over all players diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java -index d5c284cdd..4157e50e4 100644 +index d5c284cdd1..4157e50e4d 100644 --- a/src/main/java/net/minecraft/server/IEntityAccess.java +++ b/src/main/java/net/minecraft/server/IEntityAccess.java @@ -219,6 +219,12 @@ public interface IEntityAccess { @@ -23,7 +23,7 @@ index d5c284cdd..4157e50e4 100644 EntityHuman entityhuman = (EntityHuman) this.getPlayers().get(i); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index b2d8f7b9f..0fed33713 100644 +index 3d5a0f0a03..9211f996c0 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -82,6 +82,15 @@ public class WorldServer extends World { diff --git a/Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch b/Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch index 836a9cf22..0c84334f6 100644 --- a/Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch +++ b/Spigot-Server-Patches/0422-Fix-items-not-falling-correctly.patch @@ -1,4 +1,4 @@ -From be4ae53f34352e1e43cd74b924cb79a276652e73 Mon Sep 17 00:00:00 2001 +From 95477a4ceeee6324764efddc624e8699eec73b0e Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Fri, 17 Jan 2020 17:17:54 -0600 Subject: [PATCH] Fix items not falling correctly @@ -15,7 +15,7 @@ This patch resolves the conflict by offsetting checking an item's move method from Spigot's entity activation range check. diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java -index 507627a29..2926fbb95 100644 +index 507627a29f..2926fbb957 100644 --- a/src/main/java/net/minecraft/server/EntityItem.java +++ b/src/main/java/net/minecraft/server/EntityItem.java @@ -86,7 +86,7 @@ public class EntityItem extends Entity { diff --git a/Spigot-Server-Patches/0423-Lag-compensate-eating.patch b/Spigot-Server-Patches/0423-Lag-compensate-eating.patch index 74c91bbc6..29e0d6f2f 100644 --- a/Spigot-Server-Patches/0423-Lag-compensate-eating.patch +++ b/Spigot-Server-Patches/0423-Lag-compensate-eating.patch @@ -1,4 +1,4 @@ -From f9e21470e37ce717df51aee457bbcb35731509f9 Mon Sep 17 00:00:00 2001 +From 16644e48fb418cf0374ddf5dd2486a1a00662344 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 15:28:28 -0800 Subject: [PATCH] Lag compensate eating @@ -7,7 +7,7 @@ When the server is lagging, players will wait longer when eating. Change to also use a time check instead if it passes. diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6184cced7..1b9551ae0 100644 +index 6184cced73..1b9551ae09 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -113,7 +113,7 @@ public abstract class EntityLiving extends Entity { diff --git a/Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch b/Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch index 054c76475..c0b559332 100644 --- a/Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch +++ b/Spigot-Server-Patches/0424-Optimize-call-to-getFluid-for-explosions.patch @@ -1,11 +1,11 @@ -From 8b28733dc835cdfaf86d0064c0a76bc65983c398 Mon Sep 17 00:00:00 2001 +From 6a2d991ef0fa23591d77554e268d8ded9ec933a9 Mon Sep 17 00:00:00 2001 From: BrodyBeckwith Date: Tue, 14 Jan 2020 17:49:03 -0500 Subject: [PATCH] Optimize call to getFluid for explosions diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java -index d99d2defe..a353f3d5f 100644 +index d99d2defe9..a353f3d5fa 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -117,7 +117,7 @@ public class Explosion { diff --git a/Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch b/Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch index 83bdbcfce..02250aa66 100644 --- a/Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch +++ b/Spigot-Server-Patches/0425-Fix-last-firework-in-stack-not-having-effects-when-d.patch @@ -1,4 +1,4 @@ -From 07135f5c49e15c2e5e6307b9905f30a0331d0c46 Mon Sep 17 00:00:00 2001 +From 9bf99cd290145fe1b957bd023d69559190eb6102 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 17 Jan 2020 18:44:55 -0800 Subject: [PATCH] Fix last firework in stack not having effects when dispensed @@ -9,7 +9,7 @@ dispensed. The resulting item would have size == 0 and therefore be convertered to air, hence why the effects disappeared. diff --git a/src/main/java/net/minecraft/server/IDispenseBehavior.java b/src/main/java/net/minecraft/server/IDispenseBehavior.java -index b6b7e3c6c..3af686c7f 100644 +index b6b7e3c6c9..3af686c7f1 100644 --- a/src/main/java/net/minecraft/server/IDispenseBehavior.java +++ b/src/main/java/net/minecraft/server/IDispenseBehavior.java @@ -265,7 +265,7 @@ public interface IDispenseBehavior { diff --git a/Spigot-Server-Patches/0426-Activation-Range-Improvements.patch b/Spigot-Server-Patches/0426-Activation-Range-Improvements.patch index 70dd6504a..6afc93672 100644 --- a/Spigot-Server-Patches/0426-Activation-Range-Improvements.patch +++ b/Spigot-Server-Patches/0426-Activation-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 5d149308c170326343337431e4c888a7b3284eb7 Mon Sep 17 00:00:00 2001 +From 9d6f3275a1d285294b152ba5abb3c0e36d467739 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 13 May 2016 01:38:06 -0400 Subject: [PATCH] Activation Range Improvements @@ -34,7 +34,7 @@ index d522d7238d..3a248dbe37 100644 this.setMot(Vec3D.a); } + // Paper start - ignore movement changes while inactive. -+ if (isTemporarilyActive && !(this instanceof EntityItem) && vec3d == getMot() && enummovetype == EnumMoveType.SELF) { ++ if (isTemporarilyActive && vec3d == getMot() && enummovetype == EnumMoveType.SELF) { + setMot(Vec3D.a); + return; + } @@ -349,7 +349,7 @@ index 92601c581c..f4cb669740 100644 + if ( (entity.activationType != ActivationType.WATER && entity.inWater && entity.pushedByWater()) || entity.fireTicks > 0 ) // Paper { - return true; -+ return 100; // Paper ++ return 1; // Paper } if ( !( entity instanceof EntityArrow ) ) { diff --git a/Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch b/Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch index 00f538fee..a4579c0e0 100644 --- a/Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch +++ b/Spigot-Server-Patches/0427-Add-effect-to-block-break-naturally.patch @@ -1,11 +1,11 @@ -From 2492dc8648451a318f00a3d39923648251c56848 Mon Sep 17 00:00:00 2001 +From d23d177b6d56f8fc94b703c67a64df7ee1774f9f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jan 2020 12:25:07 -0600 Subject: [PATCH] Add effect to block break naturally diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java -index a667e58ed..78e84c3d6 100644 +index a667e58ed2..78e84c3d6d 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java @@ -607,12 +607,20 @@ public class CraftBlock implements Block { diff --git a/Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch b/Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch index e01a16781..d68007997 100644 --- a/Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch +++ b/Spigot-Server-Patches/0428-Tracking-Range-Improvements.patch @@ -1,4 +1,4 @@ -From 991ad54591ca2f33bce79c82194b81f57f16860c Mon Sep 17 00:00:00 2001 +From 0cfd2d9c26e2d1b12f6b3900812fc4e678a26a9e Mon Sep 17 00:00:00 2001 From: kickash32 Date: Sat, 21 Dec 2019 15:22:09 -0500 Subject: [PATCH] Tracking Range Improvements @@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code Also ignores Enderdragon, defaulting it to Mojang's setting diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java -index 6f8e6c1d0..46c33e691 100644 +index 6f8e6c1d07..46c33e6917 100644 --- a/src/main/java/org/spigotmc/TrackingRange.java +++ b/src/main/java/org/spigotmc/TrackingRange.java @@ -1,6 +1,7 @@ diff --git a/Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch b/Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch index bebd9722a..2d3f2becc 100644 --- a/Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch +++ b/Spigot-Server-Patches/0429-Fix-comparator-behavior-for-EntityPhanton-goal.patch @@ -1,11 +1,11 @@ -From 2d3b7ee6137519c4b4f5d5360ea8d88b021caf1f Mon Sep 17 00:00:00 2001 +From de1e7537f385c4ab4f0e527bc584e5c4fbef834e Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 22 Jan 2020 21:00:21 +0000 Subject: [PATCH] Fix comparator behavior for EntityPhanton goal diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java -index 82323bf4a..90eeddb1a 100644 +index 82323bf4ac..90eeddb1af 100644 --- a/src/main/java/net/minecraft/server/EntityPhantom.java +++ b/src/main/java/net/minecraft/server/EntityPhantom.java @@ -224,7 +224,7 @@ public class EntityPhantom extends EntityFlying implements IMonster { diff --git a/Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch index 1058dcde6..fcd34a04b 100644 --- a/Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch +++ b/Spigot-Server-Patches/0430-Fix-items-vanishing-through-end-portal.patch @@ -1,4 +1,4 @@ -From 0ac3b8721e23bde721c5cecbd6e253998a2ad5d1 Mon Sep 17 00:00:00 2001 +From dc179d975ef48acea548ee3a424345f87051255f Mon Sep 17 00:00:00 2001 From: AJMFactsheets Date: Wed, 22 Jan 2020 19:52:28 -0600 Subject: [PATCH] Fix items vanishing through end portal diff --git a/Spigot-Server-Patches/0431-Seed-based-feature-search.patch b/Spigot-Server-Patches/0431-Seed-based-feature-search.patch index a4055a354..b1fe4523a 100644 --- a/Spigot-Server-Patches/0431-Seed-based-feature-search.patch +++ b/Spigot-Server-Patches/0431-Seed-based-feature-search.patch @@ -1,4 +1,4 @@ -From 5f1637cf6b34737c5c2b7ffe97811faa2052ddee Mon Sep 17 00:00:00 2001 +From b7a1e0ede8a8ad47748a9b64280e27c2a5974315 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Mon, 13 Jan 2020 15:40:32 +0100 Subject: [PATCH] Seed based feature search @@ -15,7 +15,7 @@ changes but this should usually not happen. A config option to disable this improvement is added though in case that should ever be necessary. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index 3b8488d3f..bce502181 100644 +index 3b8488d3ff..bce502181f 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -359,6 +359,12 @@ public class PaperWorldConfig { @@ -32,7 +32,7 @@ index 3b8488d3f..bce502181 100644 private void maxEntityCollision() { maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) ); diff --git a/src/main/java/net/minecraft/server/BiomeManager.java b/src/main/java/net/minecraft/server/BiomeManager.java -index e96f544f1..68423645d 100644 +index e96f544f12..68423645df 100644 --- a/src/main/java/net/minecraft/server/BiomeManager.java +++ b/src/main/java/net/minecraft/server/BiomeManager.java @@ -12,10 +12,12 @@ public class BiomeManager { @@ -49,7 +49,7 @@ index e96f544f1..68423645d 100644 return this.c.a(this.b, blockposition.getX(), blockposition.getY(), blockposition.getZ(), this.a); } diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java -index f2a19acd8..09f1308b0 100644 +index f2a19acd84..09f1308b0d 100644 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java @@ -64,10 +64,12 @@ public class ChunkCoordIntPair { @@ -66,7 +66,7 @@ index f2a19acd8..09f1308b0 100644 return this.z << 4; } diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java -index e8ce2ecf2..acfe732af 100644 +index e8ce2ecf23..acfe732af5 100644 --- a/src/main/java/net/minecraft/server/StructureGenerator.java +++ b/src/main/java/net/minecraft/server/StructureGenerator.java @@ -109,6 +109,15 @@ public abstract class StructureGenerator @@ -94,7 +94,7 @@ index e8ce2ecf2..acfe732af 100644 public abstract StructureGenerator.a a(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 1cbd50450..803fe43be 100644 +index 1cbd50450d..803fe43be1 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1561,8 +1561,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch b/Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch index 83df2dcfe..c4dfa1414 100644 --- a/Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch +++ b/Spigot-Server-Patches/0432-Bees-get-gravity-in-void.-Fixes-MC-167279.patch @@ -1,11 +1,11 @@ -From 4671fa40c4fdc58f83b1a58b65fdcb18d2b27844 Mon Sep 17 00:00:00 2001 +From c59143f80f48492711b15e2ec0812415c0000222 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 26 Jan 2020 16:30:19 -0600 Subject: [PATCH] Bees get gravity in void. Fixes MC-167279 diff --git a/src/main/java/net/minecraft/server/ControllerMove.java b/src/main/java/net/minecraft/server/ControllerMove.java -index 7e3671dae..a5c4cbb67 100644 +index 7e3671dae6..a5c4cbb67f 100644 --- a/src/main/java/net/minecraft/server/ControllerMove.java +++ b/src/main/java/net/minecraft/server/ControllerMove.java @@ -2,7 +2,7 @@ package net.minecraft.server; @@ -18,7 +18,7 @@ index 7e3671dae..a5c4cbb67 100644 protected double c; protected double d; diff --git a/src/main/java/net/minecraft/server/ControllerMoveFlying.java b/src/main/java/net/minecraft/server/ControllerMoveFlying.java -index 2b6ac2eeb..0496c0c5d 100644 +index 2b6ac2eeb0..0496c0c5db 100644 --- a/src/main/java/net/minecraft/server/ControllerMoveFlying.java +++ b/src/main/java/net/minecraft/server/ControllerMoveFlying.java @@ -12,7 +12,7 @@ public class ControllerMoveFlying extends ControllerMove { @@ -31,7 +31,7 @@ index 2b6ac2eeb..0496c0c5d 100644 this.h = ControllerMove.Operation.WAIT; this.a.setNoGravity(true); diff --git a/src/main/java/net/minecraft/server/EntityBee.java b/src/main/java/net/minecraft/server/EntityBee.java -index 73e016257..c7d79efdf 100644 +index 73e0162578..c7d79efdf6 100644 --- a/src/main/java/net/minecraft/server/EntityBee.java +++ b/src/main/java/net/minecraft/server/EntityBee.java @@ -36,7 +36,17 @@ public class EntityBee extends EntityAnimal implements EntityBird { diff --git a/Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch b/Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch index 59576ae1a..de35629a0 100644 --- a/Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch +++ b/Spigot-Server-Patches/0433-Optimise-getChunkAt-calls-for-loaded-chunks.patch @@ -1,4 +1,4 @@ -From 22176ec2e3131756cb912685f72fc4cd88af8dd2 Mon Sep 17 00:00:00 2001 +From 294aff4679183b8e0dfa6b15c51d25f449bbff5a Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Sat, 25 Jan 2020 17:04:35 -0800 Subject: [PATCH] Optimise getChunkAt calls for loaded chunks @@ -7,7 +7,7 @@ bypass the need to get a player chunk, then get the either, then unwrap it... diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java -index afbe813dd..cf9021d60 100644 +index a6529cefe8..8412feef6b 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java @@ -354,6 +354,12 @@ public class ChunkProviderServer extends IChunkProvider { @@ -65,7 +65,7 @@ index afbe813dd..cf9021d60 100644 } diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 803fe43be..601a68ad6 100644 +index 803fe43be1..601a68ad60 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -259,6 +259,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch b/Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch index b3372f9b8..02b7ae988 100644 --- a/Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch +++ b/Spigot-Server-Patches/0434-Be-more-tolerant-of-invalid-attributes.patch @@ -1,4 +1,4 @@ -From d6bf11981f42a9ce30d7ffd037e9ec4468a82524 Mon Sep 17 00:00:00 2001 +From 61ba1e4e6a02527b8bd1e309d69341df4737cdcc Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 6 Feb 2020 19:20:27 -0600 Subject: [PATCH] Be more tolerant of invalid attributes @@ -11,7 +11,7 @@ In a more perfect world the API would expose some way to interact with these att particularly flexible in this area. Perhaps this is an area for future expansion at a later time. diff --git a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java -index 77e584b12..007d28b16 100644 +index 77e584b129..007d28b16c 100644 --- a/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java +++ b/src/main/java/org/bukkit/craftbukkit/attribute/CraftAttributeMap.java @@ -47,6 +47,12 @@ public class CraftAttributeMap implements Attributable { diff --git a/Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch b/Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch index 988a21ba5..b7b7b5652 100644 --- a/Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch +++ b/Spigot-Server-Patches/0435-Allow-overriding-the-java-version-check.patch @@ -1,4 +1,4 @@ -From 617d4ce92856333bf542f50f90bee785f4f9cfa7 Mon Sep 17 00:00:00 2001 +From e6cc9f8e5ccd3daa114e8add01970e96833ad583 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 8 Feb 2020 18:02:24 -0600 Subject: [PATCH] Allow overriding the java version check @@ -6,7 +6,7 @@ Subject: [PATCH] Allow overriding the java version check -DPaper.IgnoreJavaVersion=true diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 444a6a608..cb60310e6 100644 +index 444a6a608b..cb60310e63 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -175,7 +175,7 @@ public class Main { diff --git a/Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch b/Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch index 64ea7fa70..9c3840ac2 100644 --- a/Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch +++ b/Spigot-Server-Patches/0436-Add-ThrownEggHatchEvent.patch @@ -1,4 +1,4 @@ -From e55f039800a07c855ef0498f4c4a4299279e2e84 Mon Sep 17 00:00:00 2001 +From 4a261730fa0c2e357a133319c2b4f24fe18c3b22 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 9 Feb 2020 00:19:05 -0600 Subject: [PATCH] Add ThrownEggHatchEvent @@ -7,7 +7,7 @@ Adds a new event similar to PlayerEggThrowEvent, but without the Player requirem (dispensers can throw eggs to hatch them, too). diff --git a/src/main/java/net/minecraft/server/EntityEgg.java b/src/main/java/net/minecraft/server/EntityEgg.java -index 970f9109d..bdd82d052 100644 +index 970f9109d9..bdd82d052a 100644 --- a/src/main/java/net/minecraft/server/EntityEgg.java +++ b/src/main/java/net/minecraft/server/EntityEgg.java @@ -52,6 +52,16 @@ public class EntityEgg extends EntityProjectileThrowable { diff --git a/Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch b/Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch index 53abc00ba..99911a3ed 100644 --- a/Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch +++ b/Spigot-Server-Patches/0437-Optimise-random-block-ticking.patch @@ -1,4 +1,4 @@ -From 5bbd93c5ef1ef9897fcbf2bbb1566023b2faf863 Mon Sep 17 00:00:00 2001 +From 977c9a022adf2cc2dabc38fd50e46cc859e69412 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 27 Jan 2020 21:28:00 -0800 Subject: [PATCH] Optimise random block ticking @@ -420,7 +420,7 @@ index 601a68ad60..bb34486a36 100644 public boolean isSavingDisabled() { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 4c3d4c18a5..7809e81b0c 100644 +index 9211f996c0..eb99819e51 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -531,6 +531,11 @@ public class WorldServer extends World { @@ -568,5 +568,5 @@ index 4c3d4c18a5..7809e81b0c 100644 protected BlockPosition a(BlockPosition blockposition) { -- -2.25.2 +2.25.1 diff --git a/Spigot-Server-Patches/0438-Entity-Jump-API.patch b/Spigot-Server-Patches/0438-Entity-Jump-API.patch index 08aadc797..051566055 100644 --- a/Spigot-Server-Patches/0438-Entity-Jump-API.patch +++ b/Spigot-Server-Patches/0438-Entity-Jump-API.patch @@ -1,11 +1,11 @@ -From b95a66a94ffd1b25986280e041ba725fe962ba54 Mon Sep 17 00:00:00 2001 +From 0d0cea11394985fe44a5350be8cbf500c7808f0d Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 8 Feb 2020 23:26:11 -0600 Subject: [PATCH] Entity Jump API diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 1b9551ae0..ad474500e 100644 +index 1b9551ae09..ad474500e2 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -91,7 +91,7 @@ public abstract class EntityLiving extends Entity { @@ -29,7 +29,7 @@ index 1b9551ae0..ad474500e 100644 } else { this.jumpTicks = 0; diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java -index cd41c80f1..f50ed1908 100644 +index cd41c80f19..f50ed19080 100644 --- a/src/main/java/net/minecraft/server/EntityPanda.java +++ b/src/main/java/net/minecraft/server/EntityPanda.java @@ -438,7 +438,9 @@ public class EntityPanda extends EntityAnimal { @@ -43,7 +43,7 @@ index cd41c80f1..f50ed1908 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index 6de01e4f0..8ffa3cb05 100644 +index 6de01e4f0e..8ffa3cb059 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -723,5 +723,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch b/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch index fd39d0389..1d6fd53d8 100644 --- a/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch +++ b/Spigot-Server-Patches/0439-Add-option-to-nerf-pigmen-from-nether-portals.patch @@ -1,4 +1,4 @@ -From ec37e008320c5c1c3c76ec1e8eb6b1117993a89e Mon Sep 17 00:00:00 2001 +From df039154461af35a836cf8c2e82799e69e79da73 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 7 Feb 2020 14:36:56 -0600 Subject: [PATCH] Add option to nerf pigmen from nether portals diff --git a/Spigot-Server-Patches/0440-fix-blockstate-capture-undoing.patch b/Spigot-Server-Patches/0440-fix-blockstate-capture-undoing.patch index d222ffe59..85915938a 100644 --- a/Spigot-Server-Patches/0440-fix-blockstate-capture-undoing.patch +++ b/Spigot-Server-Patches/0440-fix-blockstate-capture-undoing.patch @@ -1,11 +1,11 @@ -From 4a01f268cb89bb4c08bddef7bd8e03edcb987f47 Mon Sep 17 00:00:00 2001 +From 348184180d29734db3274dd6de280a3f9faaf6a7 Mon Sep 17 00:00:00 2001 From: Trigary Date: Mon, 17 Feb 2020 22:53:33 +0100 Subject: [PATCH] fix blockstate capture undoing diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index bb34486a3..5117dafbc 100644 +index bb34486a36..5117dafbcf 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -353,7 +353,9 @@ public abstract class World implements GeneratorAccess, AutoCloseable { diff --git a/Spigot-Server-Patches/0441-Make-the-GUI-graph-fancier.patch b/Spigot-Server-Patches/0441-Make-the-GUI-graph-fancier.patch index 067bdfa8f..2ff70c91d 100644 --- a/Spigot-Server-Patches/0441-Make-the-GUI-graph-fancier.patch +++ b/Spigot-Server-Patches/0441-Make-the-GUI-graph-fancier.patch @@ -1,4 +1,4 @@ -From 088a3692ecc5649e56ec9136532dd3eed4c97c73 Mon Sep 17 00:00:00 2001 +From 2947dc9359349c1a842e3d3d60c97cdeaf0a78f7 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sun, 2 Feb 2020 04:00:40 -0600 Subject: [PATCH] Make the GUI graph fancier diff --git a/Spigot-Server-Patches/0442-Backport-fix-for-MC-167561.patch b/Spigot-Server-Patches/0442-Backport-fix-for-MC-167561.patch index f09151c32..79fa2e3a6 100644 --- a/Spigot-Server-Patches/0442-Backport-fix-for-MC-167561.patch +++ b/Spigot-Server-Patches/0442-Backport-fix-for-MC-167561.patch @@ -1,4 +1,4 @@ -From 7099030d8e7da370d14597e1b970b4e8c8b06c4c Mon Sep 17 00:00:00 2001 +From d2a4a2789cf86d69b3b1242ce8dc256a31361614 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Fri, 21 Feb 2020 18:44:28 +0000 Subject: [PATCH] Backport fix for MC-167561 diff --git a/Spigot-Server-Patches/0443-add-hand-to-BlockMultiPlaceEvent.patch b/Spigot-Server-Patches/0443-add-hand-to-BlockMultiPlaceEvent.patch index 26a4c01ce..ed31f5b15 100644 --- a/Spigot-Server-Patches/0443-add-hand-to-BlockMultiPlaceEvent.patch +++ b/Spigot-Server-Patches/0443-add-hand-to-BlockMultiPlaceEvent.patch @@ -1,4 +1,4 @@ -From 09dc724042f30bfc000ce10de47de57648cf0429 Mon Sep 17 00:00:00 2001 +From a844bc20fa2bff923b9d372a2abbced2684d14fb Mon Sep 17 00:00:00 2001 From: Trigary Date: Sun, 1 Mar 2020 22:43:24 +0100 Subject: [PATCH] add hand to BlockMultiPlaceEvent diff --git a/Spigot-Server-Patches/0444-Prevent-teleporting-dead-entities.patch b/Spigot-Server-Patches/0444-Prevent-teleporting-dead-entities.patch index 3314263e0..61e7d2499 100644 --- a/Spigot-Server-Patches/0444-Prevent-teleporting-dead-entities.patch +++ b/Spigot-Server-Patches/0444-Prevent-teleporting-dead-entities.patch @@ -1,4 +1,4 @@ -From dc82016f09e94d03fac768d35e0461fd5c09685b Mon Sep 17 00:00:00 2001 +From 425da92c8488b5a9f29b7ce249f012fe162ca632 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 3 Mar 2020 05:26:40 +0000 Subject: [PATCH] Prevent teleporting dead entities diff --git a/Spigot-Server-Patches/0445-Validate-tripwire-hook-placement-before-update.patch b/Spigot-Server-Patches/0445-Validate-tripwire-hook-placement-before-update.patch index 8a59c98ea..f7cddcdcb 100644 --- a/Spigot-Server-Patches/0445-Validate-tripwire-hook-placement-before-update.patch +++ b/Spigot-Server-Patches/0445-Validate-tripwire-hook-placement-before-update.patch @@ -1,4 +1,4 @@ -From b06f9114c5701daac5b6024b995439564d891f16 Mon Sep 17 00:00:00 2001 +From 91f9f9b14d1899439adeb620a72ba6448d24ac0a Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 7 Mar 2020 00:07:51 +0000 Subject: [PATCH] Validate tripwire hook placement before update diff --git a/Spigot-Server-Patches/0446-Add-option-to-allow-iron-golems-to-spawn-in-air.patch b/Spigot-Server-Patches/0446-Add-option-to-allow-iron-golems-to-spawn-in-air.patch index 9fbd0f93f..df23c46ee 100644 --- a/Spigot-Server-Patches/0446-Add-option-to-allow-iron-golems-to-spawn-in-air.patch +++ b/Spigot-Server-Patches/0446-Add-option-to-allow-iron-golems-to-spawn-in-air.patch @@ -1,4 +1,4 @@ -From 932a3ee4d342eda39ded873838fbd4325d91971e Mon Sep 17 00:00:00 2001 +From 7ed9b5ad6d03a910e2db85a6cf1c189eb4d4842d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 13 Apr 2019 16:50:58 -0500 Subject: [PATCH] Add option to allow iron golems to spawn in air diff --git a/Spigot-Server-Patches/0447-Configurable-chance-of-villager-zombie-infection.patch b/Spigot-Server-Patches/0447-Configurable-chance-of-villager-zombie-infection.patch index 304a78fe8..8c1aefe77 100644 --- a/Spigot-Server-Patches/0447-Configurable-chance-of-villager-zombie-infection.patch +++ b/Spigot-Server-Patches/0447-Configurable-chance-of-villager-zombie-infection.patch @@ -1,4 +1,4 @@ -From fe2815aff32618c12cccab8686133b7d974eff39 Mon Sep 17 00:00:00 2001 +From 75d1c989942511f365c2ac9b700ea844efa7b305 Mon Sep 17 00:00:00 2001 From: Zero Date: Sat, 22 Feb 2020 16:10:31 -0500 Subject: [PATCH] Configurable chance of villager zombie infection diff --git a/Spigot-Server-Patches/0448-Optimise-Chunk-getFluid.patch b/Spigot-Server-Patches/0448-Optimise-Chunk-getFluid.patch index 528945a90..49a0a6b34 100644 --- a/Spigot-Server-Patches/0448-Optimise-Chunk-getFluid.patch +++ b/Spigot-Server-Patches/0448-Optimise-Chunk-getFluid.patch @@ -1,4 +1,4 @@ -From 636a069a7da1965fe082b2283baf4c1604a46a19 Mon Sep 17 00:00:00 2001 +From 6a3222e17e9760e6855494c35c51986eb2e673a7 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 14 Jan 2020 14:59:08 -0800 Subject: [PATCH] Optimise Chunk#getFluid @@ -61,5 +61,5 @@ index 8b28fb5ee1..426221f7c3 100644 public void a() { -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0449-Optimise-TickListServer-by-rewriting-it.patch b/Spigot-Server-Patches/0449-Optimise-TickListServer-by-rewriting-it.patch index df014137b..ee46a55c0 100644 --- a/Spigot-Server-Patches/0449-Optimise-TickListServer-by-rewriting-it.patch +++ b/Spigot-Server-Patches/0449-Optimise-TickListServer-by-rewriting-it.patch @@ -1,4 +1,4 @@ -From 63b5fd64305178b6830255a2f44b07139858fbfc Mon Sep 17 00:00:00 2001 +From 82c4577d793be0bb53553d966fcf7b2f385bee7e Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Fri, 14 Feb 2020 01:24:39 -0800 Subject: [PATCH] Optimise TickListServer by rewriting it @@ -1143,7 +1143,7 @@ index f533860bbe..3f1aa5ced6 100644 } } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index aa01f47c08..2de48e7537 100644 +index eb99819e51..5ba46fca55 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -170,6 +170,13 @@ public class WorldServer extends World { @@ -1174,5 +1174,5 @@ index aa01f47c08..2de48e7537 100644 }, IRegistry.FLUID::getKey, IRegistry.FLUID::get, this::a, "Fluids"); // Paper - Timings this.navigators = Sets.newHashSet(); -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0450-Reduce-entity-tracker-updates-on-move.patch b/Spigot-Server-Patches/0450-Reduce-entity-tracker-updates-on-move.patch index a7fe22de8..12b702cb3 100644 --- a/Spigot-Server-Patches/0450-Reduce-entity-tracker-updates-on-move.patch +++ b/Spigot-Server-Patches/0450-Reduce-entity-tracker-updates-on-move.patch @@ -1,4 +1,4 @@ -From 2f08aef9d5e795b903448663ced6cf59961ad51d Mon Sep 17 00:00:00 2001 +From 28eb2f0c96f7d0f91d35ef6d102b7e36640a006d Mon Sep 17 00:00:00 2001 From: froobynooby Date: Thu, 20 Feb 2020 15:50:49 +0930 Subject: [PATCH] Reduce entity tracker updates on move diff --git a/Spigot-Server-Patches/0451-Pillager-patrol-spawn-settings-and-per-player-option.patch b/Spigot-Server-Patches/0451-Pillager-patrol-spawn-settings-and-per-player-option.patch index 5732fe750..8c5b5913b 100644 --- a/Spigot-Server-Patches/0451-Pillager-patrol-spawn-settings-and-per-player-option.patch +++ b/Spigot-Server-Patches/0451-Pillager-patrol-spawn-settings-and-per-player-option.patch @@ -1,4 +1,4 @@ -From f70336604876762f2029a026ba88f7c10744df44 Mon Sep 17 00:00:00 2001 +From 9b9f9f9e7d0b036b1dc3e1801287c1dbb594bfc6 Mon Sep 17 00:00:00 2001 From: Phoenix616 Date: Sat, 1 Feb 2020 16:50:39 +0100 Subject: [PATCH] Pillager patrol spawn settings and per player options @@ -10,7 +10,7 @@ When not per player it will use the Vanilla mechanic of one delay per world and the world age for the start day. diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java -index e93176d8f..659a011e9 100644 +index e93176d8f2..659a011e97 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -641,10 +641,21 @@ public class PaperWorldConfig { @@ -36,7 +36,7 @@ index e93176d8f..659a011e9 100644 private void entitiesTargetWithFollowRange() { entitiesTargetWithFollowRange = getBoolean("entities-target-with-follow-range", entitiesTargetWithFollowRange); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 43774bc9a..e353d9336 100644 +index 43774bc9a5..e353d93365 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -77,6 +77,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -48,7 +48,7 @@ index 43774bc9a..e353d9336 100644 public boolean queueHealthUpdatePacket = false; public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket; diff --git a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java -index a0f582807..edca6d3ab 100644 +index a0f5828076..edca6d3abd 100644 --- a/src/main/java/net/minecraft/server/MobSpawnerPatrol.java +++ b/src/main/java/net/minecraft/server/MobSpawnerPatrol.java @@ -4,12 +4,14 @@ import java.util.Random; @@ -128,7 +128,7 @@ index a0f582807..edca6d3ab 100644 if (entityhuman.isSpectator()) { return 0; diff --git a/src/main/java/net/minecraft/server/StatisticWrapper.java b/src/main/java/net/minecraft/server/StatisticWrapper.java -index 3b6034038..9c95c0ccf 100644 +index 3b6034038a..9c95c0ccfc 100644 --- a/src/main/java/net/minecraft/server/StatisticWrapper.java +++ b/src/main/java/net/minecraft/server/StatisticWrapper.java @@ -27,6 +27,7 @@ public class StatisticWrapper implements Iterable> { @@ -140,5 +140,5 @@ index 3b6034038..9c95c0ccf 100644 return this.a(t0, Counter.DEFAULT); } -- -2.26.0 +2.25.1 diff --git a/Spigot-Server-Patches/0452-Ensure-Entity-is-never-double-registered.patch b/Spigot-Server-Patches/0452-Ensure-Entity-is-never-double-registered.patch index 58f4523cd..bf2bf0f15 100644 --- a/Spigot-Server-Patches/0452-Ensure-Entity-is-never-double-registered.patch +++ b/Spigot-Server-Patches/0452-Ensure-Entity-is-never-double-registered.patch @@ -1,4 +1,4 @@ -From 679f8ee00e78b7de41adc180523cd8d6bcaa765f Mon Sep 17 00:00:00 2001 +From 7fd1e9d995e0e1dd71008037e7008ae9951bbd14 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 29 Mar 2020 18:26:14 -0400 Subject: [PATCH] Ensure Entity is never double registered @@ -11,7 +11,7 @@ Vs behavior of non ticking of just overwriting state. We will now simply log a warning when this happens instead of crashing the server. diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index 8da54c68cc..eb706f8636 100644 +index c4879ac569..d098b224fb 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -59,6 +59,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke diff --git a/Spigot-Server-Patches/0453-Fix-unregistering-entities-from-unloading-chunks.patch b/Spigot-Server-Patches/0453-Fix-unregistering-entities-from-unloading-chunks.patch index 2a19d7a46..ebd232cd2 100644 --- a/Spigot-Server-Patches/0453-Fix-unregistering-entities-from-unloading-chunks.patch +++ b/Spigot-Server-Patches/0453-Fix-unregistering-entities-from-unloading-chunks.patch @@ -1,4 +1,4 @@ -From 48d61cf99938227f87cfb748e86a9e83c169bb55 Mon Sep 17 00:00:00 2001 +From cbf316e677e64ca1dbea8c01d6af80ef4f9124d2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 Mar 2020 03:01:45 -0400 Subject: [PATCH] Fix unregistering entities from unloading chunks diff --git a/Spigot-Server-Patches/0454-Remote-Connections-shouldn-t-hold-up-shutdown.patch b/Spigot-Server-Patches/0454-Remote-Connections-shouldn-t-hold-up-shutdown.patch index 9e1275c53..4ad2c98e8 100644 --- a/Spigot-Server-Patches/0454-Remote-Connections-shouldn-t-hold-up-shutdown.patch +++ b/Spigot-Server-Patches/0454-Remote-Connections-shouldn-t-hold-up-shutdown.patch @@ -1,4 +1,4 @@ -From 13366d82bb29fe26824ede0520ac7e4190aef8c2 Mon Sep 17 00:00:00 2001 +From e7dcbbb87ef8c0eb23dbd1d3c537c05e36249c73 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 31 Mar 2020 03:50:42 -0400 Subject: [PATCH] Remote Connections shouldn't hold up shutdown diff --git a/Spigot-Server-Patches/0455-Do-not-allow-bees-to-load-chunks-for-beehives.patch b/Spigot-Server-Patches/0455-Do-not-allow-bees-to-load-chunks-for-beehives.patch index 30539b90d..2de1fe146 100644 --- a/Spigot-Server-Patches/0455-Do-not-allow-bees-to-load-chunks-for-beehives.patch +++ b/Spigot-Server-Patches/0455-Do-not-allow-bees-to-load-chunks-for-beehives.patch @@ -1,4 +1,4 @@ -From c7e8b30ec94f125f4b652d386717063c3d99e6bd Mon Sep 17 00:00:00 2001 +From 99ebcb2c4e88996aeba62c0c99ca126585afb046 Mon Sep 17 00:00:00 2001 From: chickeneer Date: Tue, 17 Mar 2020 14:18:50 -0500 Subject: [PATCH] Do not allow bees to load chunks for beehives diff --git a/Spigot-Server-Patches/0456-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch b/Spigot-Server-Patches/0456-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch index b3bdf90d3..c80e5b68f 100644 --- a/Spigot-Server-Patches/0456-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch +++ b/Spigot-Server-Patches/0456-Prevent-Double-PlayerChunkMap-adds-crashing-server.patch @@ -1,4 +1,4 @@ -From dac1fdedb69c18999aa0764714f86e00e30916b9 Mon Sep 17 00:00:00 2001 +From 2b4960bfbfb550be563d687efdee50352e72387d Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 01:42:39 -0400 Subject: [PATCH] Prevent Double PlayerChunkMap adds crashing server diff --git a/Spigot-Server-Patches/0457-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch b/Spigot-Server-Patches/0457-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch index aecc202e4..3e61a8a78 100644 --- a/Spigot-Server-Patches/0457-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch +++ b/Spigot-Server-Patches/0457-Optimize-Collision-Chunk-lookup-and-avoid-loading-fa.patch @@ -1,4 +1,4 @@ -From 7e9f51ff89183c8c78b1136528ca5e760e70aa1f Mon Sep 17 00:00:00 2001 +From 65b130822bef9a7dccd6477643a412f99cfa6aad Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 2 Apr 2020 02:37:57 -0400 Subject: [PATCH] Optimize Collision Chunk lookup and avoid loading far chunks @@ -29,7 +29,7 @@ index f851ed11df..d154487294 100644 int k2 = k1 >> 4; int l2 = i2 >> 4; - IBlockAccess iblockaccess = ICollisionAccess.this.c(k2, l2); -+ // Paper start - ensure we don't load chunks for far away chunks ++ // Paper start - ensure we don't load chunks + boolean far = entity != null && MCUtil.distance(entity.locX(), entity.locY(), entity.locZ(), x, y, z) > 32; + IBlockAccess iblockaccess = ICollisionAccess.this instanceof WorldServer ? ((WorldServer) ICollisionAccess.this).getChunkProvider().getChunkAtIfLoadedMainThread(k2, l2) : null; + if (!far && iblockaccess == null) iblockaccess = ICollisionAccess.this.c(k2, l2); diff --git a/paper b/paper index e4fb4b42c..895320be8 100755 --- a/paper +++ b/paper @@ -33,7 +33,7 @@ case "$1" in ( set -e cd "$basedir" - scripts/rebuildPatches.sh "$basedir" || exit 1 + scripts/rebuildPatches.sh "$basedir" $2 || exit 1 ) || failed=1 ;; "p" | "patch") diff --git a/scripts/upstreamMerge.sh b/scripts/upstreamMerge.sh index d59a8b442..cacfb8dec 100755 --- a/scripts/upstreamMerge.sh +++ b/scripts/upstreamMerge.sh @@ -16,7 +16,7 @@ function update { $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master refRemote=$(git rev-parse HEAD) cd ../ - $gitcmd add $1 + $gitcmd add $1 -f refHEAD=$(getRef HEAD "$workdir/$1") echo "$1 $refHEAD - $refRemote" if [ "$refHEAD" != "$refRemote" ]; then diff --git a/work/Bukkit b/work/Bukkit index 564ed1522..122289ff7 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 564ed1522adc76c68da2d1746df9e3a8a51cf5b6 +Subproject commit 122289ff79122a372e95aabf8e4e79736be725a7 diff --git a/work/CraftBukkit b/work/CraftBukkit index fc318cc10..bbe3d58ef 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit fc318cc10e26c66b36551a2d2562cecdb7410849 +Subproject commit bbe3d58efc489ce7905d4334dba82426e36610b8