Commit graph

4077 commits

Author SHA1 Message Date
Shane Freeder
0616199cad Only fire WorldSaveEvent on full chunk saves (Fixes #2161) 2019-06-10 21:45:17 +01:00
Shane Freeder
1cf86b8970 Updated Upstream (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

CraftBukkit Changes:
411609dc SPIGOT-5053: Initialize beacon with stored levels where available
b1c5fd68 SPIGOT-5054: Prevent issue with invalid hanging entities
2019-06-10 12:24:33 +01:00
Shane Freeder
bb5f617e9b Merge branch 'master' into ver/1.14 2019-06-10 10:11:29 +01:00
Shane Freeder
48f6e45add Catch exceptions from dispenser entity spawns 2019-06-10 09:52:34 +01:00
Shane Freeder
b1167a458a Improve autosave
- don't trip manual save warning
- respect world#isSavingDisabled
2019-06-10 06:39:04 +01:00
Shane Freeder
dd1c73156b Updated Upstream (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

CraftBukkit Changes:
0309d17d Rebuild patches
2019-06-10 01:29:02 +01:00
Shane Freeder
bdd1dc6535 Incremental chunk saving 2019-06-09 20:22:44 +01:00
Zach Brown
23e114975c [CI-SKIP] Update README.md 2019-06-08 16:06:07 -05:00
Zach Brown
5fd286564f Hey vscode, get your files outta my repo 2019-06-08 15:38:10 -05:00
Zach Brown
0e0501c9df Update upstream B/CB/S
--- work/Bukkit
Submodule work/Bukkit 6eac6d70..1ef8b9d9:
  > Add Player#openBook(ItemStack) method

--- work/CraftBukkit
Submodule work/CraftBukkit 17543ecf..649921e5:
  > Add Player#openBook(ItemStack) method
  > SPIGOT-2000: Picking up items to shield slot working inconsistently when inventory is full
  > SPIGOT-5037: Player.openMerchant does not show merchant level
  > SPIGOT-5038: Inventory.getHolder returns null for wandering traders

--- work/Spigot
Submodule work/Spigot baafee91..df0eb250:
  > SPIGOT-5043: Desync if world is changed in PlayerSpawnLocationEvent
  > Rebuild patches

Implementation developer note:
This patch adds a "pre-source" patch system for fixing malformed patches
from upstream directly. This seems to keep happening so it's best we
have some way to deal with them. This system brings those issues into
our domain rather than needing to wait for upstream to fix their
malformed files.
2019-06-08 15:33:05 -05:00
Spottedleaf
4d6f73449f Updated Upstream (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

CraftBukkit Changes:
17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI
0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work
bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason
2019-06-06 08:36:57 -07:00
Shane Freeder
b97ec2bf45 Fix chunk ticking range 2019-06-06 06:13:00 +01:00
simpleauthority
4fd5dff936 Make PlayerHandshakeEvent async 2019-06-05 01:00:51 -07:00
Zach Brown
f2eac5efae Flag GS4QueryEvent as async 2019-06-02 22:36:39 -05:00
Zach Brown
692aedda04 Update upstream BD/CB/S
--- work/BuildData
Submodule work/BuildData 633897ca..f0032df4:
  > Mappings Update

--- work/CraftBukkit
Submodule work/CraftBukkit b7fea427..043d31de:
  > SPIGOT-5015: Players in spectator mode prevent block placement and block projectiles
  > Make bukkitEntity private to prevent incorrect usage

--- work/Spigot
Submodule work/Spigot 01d0f046..baafee91:
  > Rebuild patches
2019-06-02 22:26:25 -05:00
Mark Vainomaa
69c044e1b7 Set connection thottle to -1 when Velocity IP forwarding is enabled
Port of 3c6f46936e
2019-06-02 21:58:14 -05:00
Zach Brown
d03adac48b Backport MC-114618 - EntityAreaEffectCloud negative size fix 2019-06-02 21:49:14 -05:00
Spottedleaf
fffe000496 Fix tabcomplete firing off-main
Also rebuild patches
2019-06-02 19:19:44 -07:00
Spottedleaf
da7a69cec3 Chunk debug command (#2118)
* Chunk debug command

Prints all chunk information to a text file into the debug
folder in the root server folder.

Will output server version and all online players to the
file as well. We do not log anything but the location,
world and username of the player.

Also logs the value of these config values (note not all are paper's):
- keep spawn loaded value
- spawn radius
- view distance

Each chunk has the following logged:
- Coordinate
- Ticket level & its corresponding state
- Whether it is queued for unload
- Chunk status (may be unloaded)
- All tickets on the chunk

Example log:
https://gist.github.com/Spottedleaf/203bd211020a3a04da0e574fb57dab45

For references on certain keywords (ticket, status, etc), please see:

https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528273&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528273
https://bugs.mojang.com/browse/MC-141484?focusedCommentId=528577&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-528577

* Use JSON for the chunk dump

* Fix obfhelper naming

* Fix incorrect JSON spec
2019-06-02 18:25:12 -07:00
Spottedleaf
c4d927468c Fix missing thread check in SimplePluginManager#callEvent (#2111) 2019-06-02 18:21:42 -07:00
Riley Park
d8aa9c7970 Merge pull request #2097 from simpleauthority/add-get-step-sound
Add BlockSoundGroup to Block & Implement
2019-06-01 21:13:31 -07:00
Spottedleaf
4ce3dc1b76 Fix memory leak if the server is constantly overloaded (#2109) 2019-05-30 20:19:06 -07:00
Zach Brown
b270fb08ff Update upstream CB/S
--- work/CraftBukkit
Submodule work/CraftBukkit ba575a5a..b7fea427:
  > SPIGOT-5010: World.getEntities returns entities in border chunks
  > Show incorrect size passed into createInventory

--- work/Spigot
Submodule work/Spigot 093165d1..01d0f046:
  > SPIGOT-4986: EntityActivationRange - Raiders
  > SPIGOT-4988: Setting "mob-spawn-range" in spigot.yml also effects random block ticks
2019-05-30 18:54:25 -05:00
Zach Brown
0e9230e80c Fix null display when no version history
Should've been null checked since I made it nullable. String concat
saved us any real damage and so all we saw was "null" shown to users.
Quick check and now we don't.
2019-05-30 18:31:48 -05:00
Zach Brown
f501069d24 Allow proto chunks to be saved again
Appear to be used more extensively in 1.14. Subject to further review.
2019-05-30 18:22:34 -05:00
Riley Park
7107c7db3c Merge pull request #2105 from mikroskeem/fix-velocity-connection-throttle
Set connection thottle to -1 when Velocity IP forwarding is enabled
2019-05-30 11:04:59 -07:00
Mark Vainomaa
e8b7718afe Set connection thottle to -1 when Velocity IP forwarding is enabled 2019-05-30 18:46:47 +03:00
Shane Freeder
18794d2123 Don't replace entries in the tracked player map (Fixes #2102) 2019-05-29 05:54:11 +01:00
Shane Freeder
35226c96e4 ChunkMapDistance-CME 2019-05-29 04:25:08 +01:00
Riley Park
e3e0ca14b6 Merge pull request #2089 from BillyGalbreath/GH2088
MC-114618 - Fix EntityAreaEffectCloud from going negative size
2019-05-28 17:44:32 -07:00
Riley Park
59681f22b7 Merge pull request #2096 from Spottedleaf/ver/1.14
Updated Upstream (CraftBukkit)
2019-05-28 04:17:39 -07:00
Spottedleaf
9b2872bd31 Updated Upstream (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

CraftBukkit Changes:
ba575a5a SPIGOT-4992: Various villager issues due to broken mapping
2019-05-28 04:15:12 -07:00
simpleauthority
cb0e26829f Add BlockSoundGroup to Block and implement 2019-05-28 03:53:48 -07:00
Spottedleaf
9f4fe93a9a Update to 1.14.2 2019-05-27 16:01:45 -07:00
William Blake Galbreath
b1fe87eb4a MC-114618 - Fix EntityAreaEffectCloud from going negative size 2019-05-27 17:36:06 -05:00
Spottedleaf
4d1f9bd463 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:
e041de28 SPIGOT-4946: Add VillagerCareerChangeEvent

CraftBukkit Changes:
fcb9f90b SPIGOT-4946: Add VillagerCareerChangeEvent
a4a2f679 SPIGOT-4987: Shulkerbox does not save empty slots
2019-05-27 03:57:28 -07:00
Zach Brown
7a5a4fd400 Move version command update checking to the implementation
This makes it easier for downstream projects (forks) to replace the
version fetching system with their own. It is as simple as implementing
an interface and overriding the default implementation of
org.bukkit.UnsafeValues#getVersionFetcher()

It also makes it easier for us to organize things like the version
history feature.

Lastly I have updated the paper implementation to check against the site
API rather than against jenkins.
2019-05-27 04:13:41 -05:00
Spottedleaf
66554efabb Improve MT-Safety of UserCache (#2080)
We were missing a synchronize on a get if cached method, however
it appears that using a ConcurrentHashMap is a better solution
so readers can avoid locking if they just want a cached value.

Existing synchronization for writers remains untouched, the
ConcurrentHashMap is just so readers can safely read without
synchronization
2019-05-26 23:17:50 -07:00
Spottedleaf
78a4e64734 Move getTypeIfLoaded and friends to IBlockAccess (#2077) 2019-05-26 23:14:14 -07:00
Spottedleaf
4a65bd4b04 Handle gen flag for placeholder getChunkAtAsync (#2079)
Also fix a loadChunk call in heightmap api
2019-05-26 22:17:12 -07:00
Zach Brown
4acb916956 Check property exists before playing chest close sound
There is an artificial delay added to chest close sounds (of 10 ticks)
to make them "feel" more true to vanilla. The problem is that because of
this delay it is possible for the block to be removed by the time the
sound plays.

With 1.14 in the state it is the timing necessary to encounter this
issue has increased.

The correct fix is to just return early if the property checked for in
the TileEntityChest sound method does not exist for the block at the
current location.

Fixes GH-2074
2019-05-26 23:36:37 -05:00
Shane Freeder
70e671043a Merge branch 'master' into ver/1.14 2019-05-27 01:16:47 +01:00
Spottedleaf
3e0027e482 Revert Don-t-recheck-type-after-setting-a-block.patch 2019-05-26 10:40:12 -07:00
Shane Freeder
db3bafc4d1 Updated Upstream (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

CraftBukkit Changes:
17da3420 Fix reading custom persistent entity data
83783357 SPIGOT-4980: Shields will not be put on cooldown when hit with an axe
8d0f3722 SPIGOT-4752: Fixed inconsistency between isChunkLoaded and chunk load/unload events
3f9f31c3 SPIGOT-4982: Armor disappearing while breaking the armor stand
2019-05-26 02:56:30 +01:00
Shane Freeder
d1f29dbbe3 Fix some concurrency issues around world generation (Fixes #2052, #2037) 2019-05-24 11:16:03 +01:00
Shane Freeder
12a934315c Updated Upstream (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

CraftBukkit Changes:
c45c0a98 SPIGOT-4972: Cannot add contextual data to loot table API
2019-05-24 04:49:27 +01:00
Spottedleaf
b8fb51a017 Add configurable spawn loaded range back (#2051) 2019-05-23 20:12:57 -07:00
Spottedleaf
50c66c63aa Fix /tps (#2066) 2019-05-22 11:57:27 -07:00
Shane Freeder
a3ad19e1a6 Actually fix compilation 2019-05-22 05:21:19 +01:00
Shane Freeder
8353831ea5 Fix compilation 2019-05-22 05:14:56 +01:00