Commit graph

772 commits

Author SHA1 Message Date
Riley Park
0df83e38b7 Adventure changes for Java 17 and Component support for resourcepack prompt 2021-12-21 23:07:17 -08:00
Jake Potrebic
7c67368f7f Add API for item entity health (#6514) 2021-12-21 23:07:15 -08:00
Jake Potrebic
5670cae051 Fix entity type tags suggestions in selectors (#6468) 2021-12-21 21:34:20 -08:00
Jake Potrebic
ba5ef6e1ac Entity powdered snow API (#6833) 2021-12-21 19:52:54 -08:00
Jake Potrebic
7bcbcb5337 Improve scoreboard entries (#6871) 2021-12-21 16:45:18 -08:00
Jake Potrebic
8df7046122 Forward CraftEntity in teleport command (#7025) 2021-12-21 16:40:24 -08:00
Jake Potrebic
dc7b80c213 Move VehicleCollisionEvent HandlerList up (#7112) 2021-12-21 16:34:44 -08:00
Jake Potrebic
a6dba1dac6 Fix breakNaturally for fluid-logged blocks (#7134) 2021-12-21 16:32:54 -08:00
Jake Potrebic
4bf1124114 Move setShouldBurnInDay to AbstractSkeleton (#7120) 2021-12-21 16:31:33 -08:00
Jake Potrebic
81cd10fd7e Add material tags for copper blocks (#7141) 2021-12-21 16:24:03 -08:00
Jake Potrebic
f9788fc8a1 Fix remapping issue with RangedAttackMob and RangedEntity (#7167) 2021-12-21 16:23:19 -08:00
Jason Penilla
b391c1cb92 Update checker framework & log4j-api for paper-api (also rebuild patches)
Note that the log4j-api version used in paper-api does not affect the version used in paper-server, this just affects the version people will see in their IDE when compiling against paper-api.
2021-12-21 01:17:52 -08:00
Noah van der Aa
eee1f6a0e0 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116) 2021-12-20 23:46:51 +01:00
Nassim Jahnke
8a5d6d18f8 Fix tripwire state inconsistency 2021-12-19 22:39:15 +01:00
Spottedleaf
a08630ed35 Only write chunk data to disk if it serializes without throwing
This ensures at least a valid version of the chunk exists
on disk, even if outdated
2021-12-19 09:15:22 -08:00
Spottedleaf
a5872264a3 Create sections for chunk conversion if non-existant
Required to add in the new biome sections
2021-12-18 01:04:00 -08:00
Nassim Jahnke
b71babb3c8 Update log4j to 2.17.0 2021-12-18 09:02:34 +01:00
Spottedleaf
1deca8eab9 Add missing return when datafixers fail for chunk conversion
Caused the chunk to be later deserialized, which would
result in spamming unrelated errors (possibly) +
double chunk completion.
2021-12-17 06:55:16 -08:00
Spottedleaf
8671893fb5 Bounds check biomes length before using.
Missed the diff by Mojang that added this, apparently some
ancient code created zero-length biomes.
2021-12-17 06:38:18 -08:00
DefineOutside
62a868c3e4 Fix empty voxel shape usage (Fixes #7043) 2021-12-15 18:15:04 +00:00
Jason Penilla
fd9b86bcb9 Fix WorldGenRegion leak when converting pre-1.18 chunks (#7097)
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
2021-12-14 13:07:42 -08:00
Nassim Jahnke
fad4c0c23a 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
336217bc15 Add more Campfire API (#5779) 2021-12-14 05:57:39 +09:00
Owen1212055
3c9fb7812d [ci skip] Add nullable annotation to field (#7042)
Co-authored-by: Riley Park <rileysebastianpark@gmail.com>
2021-12-12 23:31:32 -05:00
Lexi
e18cad9a03 Make org.bukkit.Keyed extend Adventure's Keyed (#7090) 2021-12-12 23:26:19 -05:00
Jake Potrebic
0d72808107 Updated Upstream (CraftBukkit) (#7105) 2021-12-12 19:59:43 -08:00
chickeneer
b98020331a Remove java 8 and prior reflection code from CustomTimingsHandler (#7096) 2021-12-12 01:03:06 -06:00
Jason Penilla
389b1401e9 Remove codec usage in chunk snapshot creation (#7093) 2021-12-11 17:50:45 -08:00
Nassim Jahnke
0e985b7b3b Update to 1.18.1 (#7076) 2021-12-10 15:24:07 +01:00
Glare
cad32bf4c1 Update Log4J (#7069) 2021-12-09 20:02:41 -06:00
Nassim Jahnke
fda4e8e392 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
8c901a518b Backport log4j fix 2021-12-09 17:55:19 +01:00
Jason Penilla
94afe500e2 Fix issue with snapshotted biomes in last commit 2021-12-09 04:34:11 -08:00
Jason Penilla
37bd203f8d Fix ChunkSnapshot#isSectionEmpty(int) 2021-12-09 04:09:31 -08:00
Spottedleaf
16d11b8180 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
3bf392595d Fix bad ticking checks for blocks
Caused blocks to tick outside of simulation distance
2021-12-08 22:00:45 -08:00
Jake Potrebic
b895b00dd3 Fix entity equipment on cancellation of EntityDeathEvent (#5740) 2021-12-08 10:25:57 -08:00
Nassim Jahnke
8a05540192 Bump Starlight light version 2021-12-08 08:42:44 +01:00
Nassim Jahnke
df9844576b Fix light propagation in high y sections 2021-12-07 20:33:10 +01:00
Jason Penilla
6d4c9bd717 Fix unused EntitySectionStorage#getEntities(AABB, Consumer) method being broken 2021-12-06 19:40:26 -08:00
Jake Potrebic
f065566460 Fix mis-placed processEnchantOrder from 1.18 update (#7052) 2021-12-06 12:28:36 -08:00
Noah van der Aa
6de2d9794c 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 Penilla
6d2ae19cee Port Actually unload POI data from Tuinity 1.16 (#7044) 2021-12-06 00:09:07 -08:00
Jake Potrebic
37cc5035e4 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 Penilla
77bed7ff51 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
a271feefae Add dropped hunk from mid-tick tasks (#7034) 2021-12-05 13:58:01 -08:00
Jake Potrebic
69a15173ba [ci skip] Clarify setSize consequences for Slimes (#7036) 2021-12-05 13:16:55 -08:00
Jason Penilla
a529ce18ed [ci skip] fixup indent 2021-12-05 13:07:44 -08:00
LemonCaramel
84f5407999 Fix client world difficulty sync issue (#7035) 2021-12-06 04:44:17 +09:00
Shane Freeder
e185936159 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
61ef48e0ce Revert "fix NPE from changes in e4358b82171"
This reverts commit aa3d405b36.
2021-12-05 15:10:39 +00:00
Gabriel Wolf
aa3d405b36 fix NPE from changes in e4358b82171 2021-12-05 14:36:47 +00:00
Nassim Jahnke
67aae31c6a Revert "Fix #6779"
This reverts commit 781e8f5f00.
2021-12-05 15:05:41 +01:00
Jake Potrebic
c9bbb9ab4e Update Optimise chunk tick iteration (#6950) 2021-12-05 06:00:13 -08:00
Jason Penilla
5bec4d54d0 Update Optimise collision checking in player move packet handling 2021-12-05 02:56:09 -08:00
Jason Penilla
781e8f5f00 Fix #6779 2021-12-05 01:04:07 -08:00
Jason Penilla
a30ee99728 Update Highly optimise single and multi-AABB VoxelShapes and collisions 2021-12-05 00:38:00 -08:00
Jason Penilla
c53d93419c Update and deprecate Allow delegation to vanilla chunk gen (#7031) 2021-12-05 02:27:20 -08:00
Jason Penilla
c9b5b5fbeb [ci skip] Remove reobfJar from paper-server publication (#7027) 2021-12-04 23:42:28 -08:00
Jason Penilla
44a9e2034e Remove debug checks from ZeroBitStorage (#7029) 2021-12-04 23:41:44 -08:00
Jake Potrebic
a6fdccf802 Updated Upstream (Bukkit/CraftBukkit) (#7022) 2021-12-04 23:11:59 -08:00
Jake Potrebic
07deb9ec78 further mitigate possible NPEs 2021-12-04 19:39:52 -08:00
Shane Freeder
55c371884e Fix trader merchants NPE when interacting with a merchant with non-active trades 2021-12-05 03:00:10 +00:00
stonar96
df42b6f60c 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
4a6dee7992 Add Player#sendHealthUpdate (#6904) 2021-12-04 14:10:57 +00:00
Sam
4c338a7bd1 Add PlayerItemFrameChangeEvent (#6897) 2021-12-04 13:49:34 +00:00
Noah van der Aa
3f7c1464c8 Don't get block light level if the sky level is 15 (#6922) 2021-12-04 14:24:40 +01:00
Shane Freeder
bc04c3f9bc Prevent ContainerOpenersCounter openCount from going negative (Fixes #6865) 2021-12-04 02:50:35 +00:00
Shane Freeder
e119488df5 Do not use ForkJoinPool common exector for creating client command struct (Fixes #6936) 2021-12-04 02:37:33 +00:00
Jake Potrebic
3b65d0e14c Fix kelp modifier having reverse effect (#6806) 2021-12-03 18:12:42 -08:00
Jason Penilla
308d560605 Fix kelp modifier changing growth for other crops (#7012) 2021-12-03 17:40:42 -08:00
Jake Potrebic
6682552eb2 Updated Upstream (Bukkit/CraftBukkit) (#7009) 2021-12-03 17:33:56 -08:00
Shane Freeder
df36d229fc 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
Shane Freeder
bd8e01c675 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
57c673412d Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6990) 2021-12-02 12:21:33 -08:00
SoSeDiK
05a5f029d5 Fix NPE when getting destroy speed of air (#6989) 2021-12-02 03:48:15 +02:00
Jake Potrebic
d1eed05360 Don't populate a useless spigot.yml field (#6976) 2021-12-01 10:03:46 -08:00
Nassim Jahnke
a89a84e6dd Fix itemmeta patch and move oversized fix into its own (#6980) 2021-12-01 13:32:36 +01:00
Jake Potrebic
a0f9b04f20 Don't set last hand/armor lists to stripped items (#6977) 2021-12-01 00:36:48 -08:00
Jake Potrebic
b1687cbed4 Skip stripping metadata from empty stacks (#6973) 2021-11-30 18:59:09 -08:00
Noah van der Aa
6059060adf Port flat bedrock (generator settings) to 1.18 (#6960) 2021-12-01 02:31:13 +01:00
Noah van der Aa
15addfd44c Hide unnecessary itemmeta from clients (#6318)
Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
2021-11-30 23:47:10 +01:00
Jake Potrebic
64dd6f189d Fix removing recipes (#6965) 2021-11-30 12:27:27 -08:00
Nassim Jahnke
fcd5f7c996 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 17:23:56 +01:00
Nassim Jahnke
91b1d01dbd 1.18 Release 2021-11-30 09:58:25 +01:00
Jason Penilla
82eff9628d re-inline Goal.Flag iteration 2021-11-30 00:36:30 -08:00
Jake Potrebic
aa8a9905a9 another patch 2021-11-29 23:32:30 -08:00
Jake Potrebic
b8cb9f5141 couple more patches 2021-11-29 21:25:11 -08:00
Nassim Jahnke
fe71cb6a04 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-29 13:15:54 +01:00
stonar96
0f6ca558f1 Port Anti-Xray to 1.18 (#6947) 2021-11-29 12:55:13 +01:00
Jake Potrebic
9403115c81 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-28 15:46:53 -08:00
Jake Potrebic
8ab4559517 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-28 12:35:21 -08:00
Nassim Jahnke
9077107f7d Update readme, rename incremental chunk saving 2021-11-28 16:02:52 +01:00
Jake Potrebic
7d08c18917 Update paperclip and yarn mappings (#6943) 2021-11-28 00:33:00 -08:00
Jake Potrebic
a57ac61755 add mobcaps command patch 2021-11-27 22:56:41 -08:00
Jake Potrebic
0c9cd48d9b 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-27 22:31:38 -08:00
Jake Potrebic
8aed88b8db 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-27 19:24:49 -08:00
Kyle Wood
08ac01db8f Bump Paperclip and fix configuration cache issue 2021-11-27 21:06:16 -06:00
Nassim Jahnke
bd2bbe7bf4 Cleanup unnecessary hopper optimization diff
Fixes #6941
2021-11-27 21:52:29 +01:00
Nassim Jahnke
4641f37f4d Fix oversized chunk merging 2021-11-27 16:07:45 +01:00