Commit Graph

664 Commits

Author SHA1 Message Date
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
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
Nassim Jahnke
8c78a82906 Cleanup unnecessary hopper optimization diff
Fixes #6941
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
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
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
Nassim Jahnke
e8f01f89d2 Rename optimize isOutsideRange patch 2021-11-30 19:26:33 +01:00
Nassim Jahnke
86b1213a0b Readd configurable feature seed patch 2021-11-30 19:26:33 +01:00
Nassim Jahnke
4e60e11b6b Fix incremental player saving check 2021-11-30 19:26:33 +01:00
Nassim Jahnke
5a90a2033d More more more more more more more more more more more more more more more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
e85e1f4e49 Fix fuckups from previous commit 2021-11-30 19:26:33 +01:00
Nassim Jahnke
dabbf5b193 More more more more more more more more more more more more more more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
011df7dc84 More more more more more more more more more more more more more more more more work 2021-11-30 19:26:33 +01:00
Jason Penilla
055b8ab9cf even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even more patches 2021-11-30 19:26:33 +01:00
Jason Penilla
b39fa92d5d even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even more patches 2021-11-30 19:26:33 +01:00
Jason Penilla
f04f3321e3 even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even more patches 2021-11-30 19:26:33 +01:00
Jason Penilla
dc58f85df2 even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even even more patches 2021-11-30 19:26:33 +01:00
Jason Penilla
fdde23eecf even even even even even more patches 2021-11-30 19:26:33 +01:00
Josh Roy
aa948d8338 more i guess pepeW 2021-11-30 19:26:33 +01:00
Josh Roy
c1d14dc076 all api patches done*
*still waiting for leaf to port datafixer to 1.18 so i can do entity serialization
2021-11-30 19:26:33 +01:00
Jason Penilla
4df6820f86 Remove pom for paperclip install to maven local 2021-11-30 19:26:33 +01:00
Jake
2e347b629d and yet again, more patches 2021-11-30 19:26:33 +01:00
Jake
4664528315 more patches done 2021-11-30 19:26:33 +01:00
Jake
c4ef2add48 patches and remap fixes 2021-11-30 19:26:33 +01:00
Jake
00be0b7b30 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:
d25437bc Update to Minecraft 1.18-pre8

CraftBukkit Changes:
5a39a236 Update to Minecraft 1.18-pre8

Spigot Changes:
7840c2af Update to Minecraft 1.18-pre8
2021-11-30 19:26:33 +01:00
Jake
5a2d3b2b29 more patches 2021-11-30 19:26:33 +01:00
Jason Penilla
35aeb0ddeb Update server build file 2021-11-30 19:26:33 +01:00
Jake
6ccc23f457 even MOOOOOOOOOOOOAAAAAAAAAAAAAAAARRRRRRRRRRRRR patches 2021-11-30 19:26:33 +01:00
Jake
1cb76e15be moaaaaaaaar patches 2021-11-30 19:26:33 +01:00
Jake
6f5b43e290 moaaaaar patches 2021-11-30 19:26:33 +01:00
Jake
e141126891 even moaar patches 2021-11-30 19:26:33 +01:00
Jake
f331ac28e0 add back Optimize collision to not load chunks 2021-11-30 19:26:33 +01:00
Jake
c280dbeed0 moar patches 2021-11-30 19:26:33 +01:00
Jake
3436ed93c2 a bunch more patches done 2021-11-30 19:26:33 +01:00
Jake
3dbf41c443 updated more patches 2021-11-30 19:26:33 +01:00
Jake
0f7ca21add several more patches updated 2021-11-30 19:26:33 +01:00
Nassim Jahnke
26dcf812a4 More more more more more more more more more more more more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
97a4a70766 More more more more more more more more more more more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
45c36e5d0c More more more more more more more more more more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
4e81c1fe78 More more more more more more more more more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
8f67d293a2 More more more more more more more more more more more work 2021-11-30 19:26:33 +01:00
Jason Penilla
0358549f7b p a t c h e s 2021-11-30 19:26:33 +01:00
Jason Penilla
e208af9741 patches 2021-11-30 19:26:33 +01:00
Nassim Jahnke
8f64c190ef Fix Paper comments 2021-11-30 19:26:33 +01:00
Nassim Jahnke
f43f1e217e More more more more more more more more more more work 2021-11-30 19:26:33 +01:00
MiniDigger
6ac2614a5f hey, look ma, am doing my part! 2021-11-30 19:26:33 +01:00
Jason Penilla
1d74ffcb7c Fixup indent in async chunk io patch 2021-11-30 19:26:33 +01:00
Jake
0f23d73d1a a bunch more patches 2021-11-30 19:26:33 +01:00
Jake
2b29fe37a2 more patches updated 2021-11-30 19:26:33 +01:00
Jason Penilla
5d0d11e4b6 Patches 2021-11-30 19:26:33 +01:00
Jake
2004ff214a more work 2021-11-30 19:26:33 +01:00
Jake
753267a57e and here's some more patches 2021-11-30 19:26:33 +01:00