Commit graph

6435 commits

Author SHA1 Message Date
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
Jake Potrebic
f25255a7b8 [ci skip] adjust upstreamCommit script to not mention paper issues (#6956) 2021-12-03 17:20:19 -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
Finn Künstner
507de7bc83 Updated Upstream (CraftBukkit) (#7007) 2021-12-03 22:11:19 +01:00
Jake Potrebic
e6be46422e 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-02 21:46:07 -08: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
Jason Penilla
0f7314ee80 Build updates (#6992) 2021-12-01 23:21:14 -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
Shane Freeder
16ba421c40 Update paperclip to v3.0.2 2021-12-01 09:28:22 +00: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
Jake Potrebic
77e275cff4 Add missing AT (#6970) 2021-11-30 18:28:16 -08:00
Noah van der Aa
6059060adf Port flat bedrock (generator settings) to 1.18 (#6960) 2021-12-01 02:31:13 +01:00
Kyle Wood
24a1e6f91d Update to paperweight 1.3.0 2021-11-30 19:10:15 -06:00
Noah van der Aa
1b84684982 Updated Upstream (CraftBukkit) (#6966) 2021-12-01 01:43:02 +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
257767914b [ci skip] remove core team from catch-all codeowners (#6958) 2021-11-30 19:48:50 +01:00
Nassim Jahnke
0d4c925454 Update gradle.properties 2021-11-30 17:42:41 +01: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
2fd081ef17 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:
806bb02c SPIGOT-6810: Improve / fix biome setting code
2021-11-27 18:28:03 +01:00
Nassim Jahnke
1df2365bde Move seed based feature search to no longer needed 2021-11-27 16:14:02 +01:00