Commit graph

774 commits

Author SHA1 Message Date
Jason 95d881f916
Fix WorldGenRegion leak when converting pre-1.18 chunks (#7097)
Co-authored-by: Nassim Jahnke <jahnke.nassim@gmail.com>
2021-12-14 22:07:42 +01:00
Nassim Jahnke 51d168752b
Update log4j to 2.16.0
No confirmed attack vector, and definitely no attack vector for normal setups, but, just in case.
2021-12-14 20:08:40 +01:00
LemonCaramel 7f310957bc
Add more Campfire API (#5779) 2021-12-13 12:57:39 -08:00
Owen1212055 d8747c13e5
[ci skip] Add nullable annotation to field (#7042)
Co-authored-by: Riley Park <riley.park@meino.net>
2021-12-12 20:31:32 -08:00
Lexi df1301b53a
Make org.bukkit.Keyed extend Adventure's Keyed (#7090) 2021-12-12 20:26:19 -08:00
Jake Potrebic c1bd3cc8fd
Updated Upstream (CraftBukkit) (#7105) 2021-12-12 19:59:43 -08:00
chickeneer 874532613c
Remove java 8 and prior reflection code from CustomTimingsHandler (#7096) 2021-12-11 23:03:06 -08:00
Jason 29bd57b4c8
Remove codec usage in chunk snapshot creation (#7093) 2021-12-11 17:50:45 -08:00
Nassim Jahnke 1c779c2d2e
Update to 1.18.1 (#7076) 2021-12-10 15:24:07 +01:00
Glare dce79f333c
Update Log4J (#7069) 2021-12-09 18:02:41 -08:00
Nassim Jahnke 4e355c488d
Updated Upstream (CraftBukkit)
Upstream has released updates that appear 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:
35d3986e Disable log4j message formatting
040e0c3b Increase outdated build delay
2021-12-09 21:59:59 +01:00
Nassim Jahnke b475c6a683
Backport log4j fix 2021-12-09 17:55:19 +01:00
Jason Penilla bbc745158d
Fix issue with snapshotted biomes in last commit 2021-12-09 04:36:03 -08:00
Jason Penilla 188a8dfc4c
Fix ChunkSnapshot#isSectionEmpty(int) 2021-12-09 04:11:04 -08:00
Spottedleaf 0e91b6ae9b Return 0 for light values if a dimenion does not have them
Fixes https://github.com/PaperMC/Starlight/issues/99
2021-12-08 22:01:02 -08:00
Spottedleaf 758e2a7ee2 Fix bad ticking checks for blocks
Caused blocks to tick outside of simulation distance
2021-12-08 22:00:45 -08:00
Jake Potrebic 74fd151adc
Fix entity equipment on cancellation of EntityDeathEvent (#5740) 2021-12-08 10:25:57 -08:00
Nassim Jahnke 33ea869a65
Bump Starlight light version 2021-12-08 08:42:44 +01:00
Nassim Jahnke 772e880f29
Fix light propagation in high y sections 2021-12-07 20:33:10 +01:00
Jason Penilla 53d026edcd
Fix unused EntitySectionStorage#getEntities(AABB, Consumer) method being broken 2021-12-06 19:40:26 -08:00
Jake Potrebic 0e25db214f
Fix mis-placed processEnchantOrder from 1.18 update (#7052) 2021-12-06 12:28:36 -08:00
Noah van der Aa b4a77a84a7
Updated Upstream (Bukkit/CraftBukkit) (#7045)
Upstream has released updates that appear 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:
ffd8b289 PR-687: Fix NPE from previous commits

CraftBukkit Changes:
3c2af1b7 SPIGOT-6831: Fix llama strength crash
2021-12-06 13:43:46 +01:00
Jason af95df8d40
Port Actually unload POI data from Tuinity 1.16 (#7044) 2021-12-06 00:09:07 -08:00
Jake Potrebic a50e2736a7
Include axolotls in affected entities for water splash potions (#7024)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-12-05 17:56:55 -08:00
Jason fd263ef962
Fix empty/null chunk section check in LevelChunk#getBlockData, rename… (#7039)
… patch and methods to make more sense with Mojang mappings
2021-12-05 15:32:02 -08:00
Jake Potrebic 7c8fdc1fb6
Add dropped hunk from mid-tick tasks (#7034) 2021-12-05 13:58:01 -08:00
Jake Potrebic 83aee0f551
[ci skip] Clarify setSize consequences for Slimes (#7036) 2021-12-05 13:16:55 -08:00
Jason Penilla a4782f72f7
[ci skip] fixup indent 2021-12-05 13:07:44 -08:00
LemonCaramel c83700291a
Fix client world difficulty sync issue (#7035) 2021-12-05 20:44:17 +01:00
Shane Freeder 323c087397
Revert "#686: Fix contains for default section generating real sections"
This commit causes an NPE when getting from the config in some states,
given upstream issue and PR in the works, I have 0 inclination to debug
this

This reverts commit e4358b8217126bbcc3a38b0d17097ad5ab87c50a.
2021-12-05 15:20:52 +00:00
Shane Freeder 5b6445aaaf
Revert "fix NPE from changes in e4358b82171"
This reverts commit b4192fd8e6.
2021-12-05 15:10:39 +00:00
Gabriel Wolf b4192fd8e6
fix NPE from changes in e4358b82171 2021-12-05 14:36:47 +00:00
Nassim Jahnke 6b072ee589
Revert "Fix #6779"
This reverts commit 78faaa4f8e.
2021-12-05 15:05:41 +01:00
Jake Potrebic fd4f6c5e31
Update Optimise chunk tick iteration (#6950) 2021-12-05 15:00:13 +01:00
Jason Penilla c3ff7e0ff7
Update Optimise collision checking in player move packet handling 2021-12-05 02:56:09 -08:00
Jason Penilla 78faaa4f8e Fix #6779 2021-12-05 02:45:09 -08:00
Jason Penilla fcca15ff0b Update Highly optimise single and multi-AABB VoxelShapes and collisions 2021-12-05 02:45:09 -08:00
Jason ccabae4fb6
Update and deprecate Allow delegation to vanilla chunk gen (#7031) 2021-12-05 02:27:20 -08:00
Jason a42917dd10
[ci skip] Remove reobfJar from paper-server publication (#7027) 2021-12-04 23:42:28 -08:00
Jason 62fd374c36
Remove debug checks from ZeroBitStorage (#7029) 2021-12-04 23:41:44 -08:00
Jake Potrebic fd352861b0
Updated Upstream (Bukkit/CraftBukkit) (#7022) 2021-12-04 23:11:59 -08:00
Jake Potrebic 54b0c41c20
further mitigate possible NPEs 2021-12-04 19:39:52 -08:00
Shane Freeder 52f95706d2
Fix trader merchants NPE when interacting with a merchant with non-active trades 2021-12-05 03:00:13 +00:00
stonar96 76ee105811
Optimize HashMapPalette (#5074)
HashMapPalette uses an instance of CrudeIncrementalIntIdentityHashBiMap
internally. A Palette has a preset maximum size = 1 << bits.
CrudeIncrementalIntIdentityHashBiMap has an initial size but is
automatically resized. The CrudeIncrementalIntIdentityHashBiMap is created
with the maximum size in the constructor of HashMapPalette, with the aim
that it doesn't need to be resized anymore. However, there are two things
that I think Mojang hasn't considered here:
1) The CrudeIncrementalIntIdentityHashBiMap is resized, when its initial
size is reached and not the next time, when a further object is added.
2) HashMapPalette adds objects (unnecessarily) before checking if the
initial size of CrudeIncrementalIntIdentityHashBiMap is reached.
This means to actually avoid resize operations in
CrudeIncrementalIntIdentityHashBiMap, one has to add 2 to the initial size
or add 1 and check the size before adding objects. This commit implements
the second approach. Note that this isn't only an optimization but also
makes async reads of Palettes fail-safe. An async read while the
CrudeIncrementalIntIdentityHashBiMap is resized is fatal and can even lead
to corrupted data. This is also something that Anti-Xray is currently
relying on.
2021-12-04 15:56:34 +01:00
Sam 63a97a64a3
Add Player#sendHealthUpdate (#6904) 2021-12-04 15:10:57 +01:00
Sam bae37ad2d8
Add PlayerItemFrameChangeEvent (#6897) 2021-12-04 14:49:34 +01:00
Noah van der Aa 614ed1de72
Don't get block light level if the sky level is 15 (#6922) 2021-12-04 14:24:40 +01:00
Shane Freeder 77ff1f3005
Prevent ContainerOpenersCounter openCount from going negative (Fixes #6865) 2021-12-04 02:50:35 +00:00
Shane Freeder 7323594d59
Do not use ForkJoinPool common exector for creating client command struct (Fixes #6936) 2021-12-04 02:37:33 +00:00
Jake Potrebic 2b97750f60
Fix kelp modifier having reverse effect (#6806) 2021-12-03 18:12:42 -08:00
Jason 675d1e3f58
Fix kelp modifier changing growth for other crops (#7012) 2021-12-03 17:40:42 -08:00
Jake Potrebic b653ee1a91
Updated Upstream (Bukkit/CraftBukkit) (#7009) 2021-12-03 17:33:56 -08:00
Shane Freeder 2f31569807
Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear 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:
9115281f SPIGOT-6832: Improve Player#getPing docs

CraftBukkit Changes:
fd3478bc7 #967: Store last lava contact location for events

Spigot Changes:
dbf49382 Rebuild patches
58cb9d26 #113: Use simulationDistance for entity activation range base
2021-12-03 21:28:15 +00:00
Jake Potrebic 1f5b013cbe Updated Upstream (CraftBukkit)
Upstream has released updates that appear 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:
4b5f9882 Fix when bundler directory is a symlink
6f3509d1 Release POIs when villagers are removed by plugins
2021-12-03 11:53:17 +01:00
Shane Freeder cfa5b37fa8
Updated Upstream (CraftBukkit)
Upstream has released updates that appear 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:
03b725233 SPIGOT-6823: Fix loading custom world in combination with superflat
359d0533a #970: Correct typo in README.md
110492932 Fix per-world worldborder command
2021-12-03 00:26:54 +00:00
Jake Potrebic 057adb04f1
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6990) 2021-12-02 12:21:33 -08:00
Jason 956124f86a
Build updates (#6992) 2021-12-01 23:21:14 -08:00
SoSeDiK a5a7782f40
Fix NPE when getting destroy speed of air (#6989) 2021-12-02 01:48:15 +00:00
Jake Potrebic 0cd411efdf
Don't populate a useless spigot.yml field (#6976) 2021-12-01 10:03:46 -08:00
Nassim Jahnke 892c292dc9
Fix itemmeta patch and move oversized fix into its own (#6980) 2021-12-01 13:32:36 +01:00
Jake Potrebic 72983892cf
Don't set last hand/armor lists to stripped items (#6977) 2021-12-01 00:36:48 -08:00
Jake Potrebic cb195e1958
Skip stripping metadata from empty stacks (#6973) 2021-11-30 18:59:09 -08:00
Noah van der Aa cd9fe9ca64
Port flat bedrock (generator settings) to 1.18 (#6960) 2021-11-30 17:31:13 -08:00
Noah van der Aa 0152c9c41c
Updated Upstream (CraftBukkit) (#6966) 2021-11-30 16:43:02 -08:00
Noah van der Aa e955cb5b26
Hide unnecessary itemmeta from clients (#6318)
Co-authored-by: Nassim Jahnke <jahnke.nassim@gmail.com>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
2021-11-30 14:47:10 -08:00
Jake Potrebic bd9c2b75c7
Fix removing recipes (#6965) 2021-11-30 12:27:27 -08:00
Nassim Jahnke b2bc5b9ee7 Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear 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:
b46ac671 Update to Minecraft 1.18

CraftBukkit Changes:
bc14cb64 Update to Minecraft 1.18

Spigot Changes:
a5dea1cb Update to Minecraft 1.18
2021-11-30 19:26:33 +01:00
Nassim Jahnke 971ca7e4d1 1.18 Release 2021-11-30 19:26:33 +01:00
Jason Penilla 754dfd1eb2 re-inline Goal.Flag iteration 2021-11-30 19:26:33 +01:00
Jake d8d7f52324 another patch 2021-11-30 19:26:33 +01:00
Jake 5ff792342c couple more patches 2021-11-30 19:26:33 +01:00
Nassim Jahnke bcc11dd95a Remove old anti xray patch 2021-11-30 19:26:33 +01:00
Nassim Jahnke 903aa737d8 Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear 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:
ab6e73a2 Correct copied javadoc from previous commit

CraftBukkit Changes:
9fb3aa4c SPIGOT-6817: Revert back to old block state behaviour again
2021-11-30 19:26:33 +01:00
stonar96 4ab59e1326 Port Anti-Xray to 1.18 (#6947) 2021-11-30 19:26:33 +01:00
Jake ebb727e629 Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear 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:
810cb078 Add hideEntity / showEntity API

CraftBukkit Changes:
04f8e7e2 SPIGOT-6814: (Chunk) PersistentData is lost after restart
37fd1917 Add hideEntity / showEntity API
7e2214da Move checkstyle to slightly later compile phase
45c3f826 SPIGOT-6816: Fix ChunkSnapshot#getBiome

Spigot Changes:
b11f318f Rebuild patches
622b2310 SPIGOT-6811: Fix mob spawning mismatch
2b2a3d56 Rebuild patches
2021-11-30 19:26:33 +01:00
Jake d3ffbcdd52 Fixes chunks not loading PDC sometimes
If a chunk had no entities or block entities, it would fail
to load the PDC. This adds an additional check to see if there is
PDC and then to load that if so.

See: https://hub.spigotmc.org/jira/browse/SPIGOT-6814
2021-11-30 19:26:33 +01:00
Nassim Jahnke a372cea5d2 Update readme, rename incremental chunk saving 2021-11-30 19:26:33 +01:00
Jake Potrebic ba722a8c9d Update paperclip and yarn mappings (#6943) 2021-11-30 19:26:33 +01:00
Jake 7382bd2847 add mobcaps command patch 2021-11-30 19:26:33 +01:00
Jake 9beac6a2a4 Fix hostile mob spawning
Upstream adds this check and didn't flip it since mojang flipped the
return boolean from previous versions. This will end up removed
from this patch when (if) upstream fixes this
2021-11-30 19:26:33 +01:00
Jake afbaa18bf6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear 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:
c9b35cdb PR-684: Make PotionEffectType implement Keyed

CraftBukkit Changes:
c86a3f7a PR-959: Fix World#refreshChunk
af8a8b70 PR-962: Make PotionEffectType implement Keyed

Spigot Changes:
7514aa37 SPIGOT-6806: Add setting to disable new chunks generation under existing chunks
2021-11-30 19:26:33 +01:00
Kyle Wood 0af80abdca Bump Paperclip and fix configuration cache issue 2021-11-30 19:26:33 +01:00
Nassim Jahnke 8c78a82906 Cleanup unnecessary hopper optimization diff
Fixes #6941
2021-11-30 19:26:33 +01:00
Nassim Jahnke 08939b2db8 Move seed based feature search to no longer needed 2021-11-30 19:26:33 +01:00
Nassim Jahnke 0440a08b8d Fix oversized chunk merging 2021-11-30 19:26:33 +01:00
Spottedleaf 8e5d5b8753 Add Starlight 2021-11-30 19:26:33 +01:00
Jason 3c586898a5 Use old dataconverter hooks (#6938) 2021-11-30 19:26:33 +01:00
Jason Penilla 21cb7a63fb Further manifest fixes 2021-11-30 19:26:33 +01:00
Jason Penilla 8d5f9137b4 Fix issue with manifest util in tests 2021-11-30 19:26:33 +01:00
MiniDigger 4a466ac7d1 change my email in all patches 2021-11-30 19:26:33 +01:00
Jason Penilla c0f2385c99 Remove redundant json-simple dependency and move isTransitive = false from server to api 2021-11-30 19:26:33 +01:00
Jason Penilla 231e0cd3b5 Rebuild patches with record field access fix 2021-11-30 19:26:33 +01:00
Jason Penilla 251b568882 Fix manifest util for bundler jars 2021-11-30 19:26:33 +01:00
Jason Penilla 7abff79737 Remove client-side code using deprecated for removal
AccessController

Fixes warnings on build
2021-11-30 19:26:33 +01:00
Josh Roy bc0dd0df3d Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appear 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:
716b4fce Revert SnakeYAML upgrade
ca6f8942 Update to Minecraft 1.18-rc3
57e7e952 #683: Add Player#showDemoScreen

CraftBukkit Changes:
c98abfb0 Update to Minecraft 1.18-rc3
9b258501 #960: Add Player#showDemoScreen
d9542247 Produce remapped jars after bootstrap jar
99f3ddde SPIGOT-6808: Fix RegionAccessor#getBiome

Spigot Changes:
b7a4222e Update to Minecraft 1.18-rc3
2021-11-30 19:26:33 +01:00
Nassim Jahnke 134a61c111 Readd incremental chunk saving, merge with player saving 2021-11-30 19:26:33 +01:00
Nassim Jahnke 738788079b Remove deprecated protoworld api 2021-11-30 19:26:33 +01:00
Nassim Jahnke 10c6a1bd9e Fix configurable feature seed patch 2021-11-30 19:26:33 +01:00
Kyle Wood 0675784032 Fix stacktrace deobf when running as a bundler jar 2021-11-30 19:26:33 +01:00
Kyle Wood e519a51f95 Upgrade paperweight with bundler jar updates
This allows creating paperclip jars pre-patch (only the reobf'd jar for
now).
2021-11-30 19:26:33 +01:00