Commit Graph

598 Commits

Author SHA1 Message Date
Nassim Jahnke
6f3591fd6d More more more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
d7cdc72bdf More more more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
e9954ed32a More more more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
c8cb91bb99 More more work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
456621b0d7 More work 2021-11-30 19:26:33 +01:00
Nassim Jahnke
31f9d01c7c Work 2021-11-30 19:26:33 +01:00
Jason Penilla
284a7fed94 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:
07a05531 SPIGOT-6781: Add Block#canPlace

CraftBukkit Changes:
dd02403b Fix upgrading worlds with custom generators
1c82731d SPIGOT-6781: Add Block#canPlace
2f6662d4 Improve multi-dimension code
6ac2e032 SPIGOT-6802: Fix major issues with --forceUpgrade

Spigot Changes:
d5de7346 Rebuild patches
2021-11-30 19:26:33 +01:00
Jason Penilla
a8ef7aa56f Prepare for updating server patches 2021-11-30 19:26:33 +01:00
Nassim Jahnke
3e71cf19dc Remove Fix reducedDebugInfo not initialized on client patch
Hasn't been needed for a while now, see #6733
2021-11-30 19:26:33 +01:00
Josh Roy
22aaf91368
Add config option to enable hopper occluding blocks (#6896)
Co-authored-by: zombachu <zombachu@gmail.com>
2021-11-20 14:15:36 -05:00
Josh Roy
284b3b8dd2
Fix AnvilPrepareEvent not working with zero xp (#6895)
Co-authored-by: Jan Tuck <jan@tuck.dk>
2021-11-20 14:09:19 -05:00
Nassim Jahnke
e22a1a9d05
Fix more namespacedkey parsing (#6903) 2021-11-17 10:53:41 +01:00
Jason
f3830bc214
Update paperweight to 1.2.0 (#6901) 2021-11-16 21:00:14 -08:00
booky10
51b7b609f1
Add API for resetting a single score (#6873) 2021-11-15 15:08:50 -08:00
Jake Potrebic
555f99d390
cleanup: Add hand to bucket events patch (#6881) 2021-11-15 20:01:19 +01:00
Jake Potrebic
db0bff9c6a
Call onRemove logic for breakNaturally (#6854) 2021-11-12 18:28:08 -08:00
Jason
4d6073faff
Partially fix #6880 (#6888) 2021-11-12 14:27:26 -08:00
Josh Roy
cc2ecbc407
Add Raw Byte Entity Serialization (#6826) 2021-11-10 21:53:27 -05:00
Seggan
3f17694803
Goat ram API (#6336) 2021-11-09 00:48:22 -08:00
Jake Potrebic
a923e332ee
Make despawn distance configs per-category, improve per category spawn limit config (#6717)
Also adds per-world spawn limit config in paper.yml for `underground_water_creature`, and migrates existing spawn limit config options to their Mojang names.
2021-11-08 23:59:15 -08:00
Owen1212055
87121cef29
Move getTrackedPlayers up from Player to Entity (#6569) 2021-11-08 13:39:42 -08:00
Bjarne Koll
32ba0881e8
Fix setPatternColor on tropical fish bucket meta (#6877) 2021-11-08 11:20:07 -08:00
Jake Potrebic
5af80b0ab8
Add isCollidable methods to various places (#6870) 2021-11-06 12:43:24 -07:00
Jake Potrebic
22b02387c3
Add API for checking if a zombie has the option to break doors (#6855) 2021-11-05 17:17:12 -07:00
Jake Potrebic
124d079dd0
Fix issues with mob conversion (#6831) 2021-11-05 17:06:19 -07:00
Nassim Jahnke
c20c9d39d3
Fix CraftNamespacedKey shenanigans (#6825) 2021-11-05 16:01:40 +01:00
Bjarne Koll
70fe58d0a0
Expose the potential player cause of a lightning (#6782) 2021-11-05 15:54:37 +01:00
PaulBGD
06d82e0d6d
Cache palette array (#6767)
Instead of allocating the 4KB for every chunk section, cache it locally and
reuse it for other chunk sections to save on allocations. These allocations add
up very quickly when saving chunks frequently.

For example, with 30,000 chunks and 16 chunk sections per chunk (which will
actually get larger in 1.18) it allocates nearly 2GB, which this patch
eliminates entirely.
2021-11-05 15:52:32 +01:00
Nassim Jahnke
ada930bf8d
Updated Upstream (Bukkit/CraftBukkit) (#6872)
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:
cfd18bd0 SPIGOT-6436: Add Player#stopAllSounds

CraftBukkit Changes:
b58f4299 SPIGOT-6436: Add Player#stopAllSounds
eb191612 SPIGOT-6783: Items do not appear in custom anvil inventories
376edf4f SPIGOT-6779: Fix LivingEntity#attack for Player entities
747a73ec SPIGOT-6772: Use entity mailbox and re-schedule entities if they get unloaded
2021-11-05 15:08:24 +01:00
Jason
6f71b7c4a9
Deduplicate strings in ObfHelper (#6841) 2021-11-04 17:23:06 -07:00
Jake Potrebic
0968cddbcd
Move async catches back to where they were (#6869) 2021-11-04 11:20:14 -07:00
Jake Potrebic
09d50a9277
Added missing mappings (#6810) 2021-11-04 07:08:53 -07:00
Jason
3e310e096c
Remove redundant and unneeded repos, reorder repos (#6867) 2021-11-04 02:42:18 +00:00
Jason
d9e2817ffd
Update paperweight to 1.1.13 (#6866) 2021-11-03 17:54:11 -07:00
Shane Freeder
bc43f40f0d
Update jline and TCA (#6829)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>

updates jline to 3.21.0, and TCA to 1.3.0
2021-11-02 18:02:16 +00:00
Spottedleaf
3f043f7eb9 Async catch modifications to critical entity state
These used to be here from Spigot, but were dropped with 1.17.
Now in 1.17, this state is _even more_ critical than it was before,
so these must exist to catch stupid plugins.
2021-10-31 21:35:47 -07:00
Jake Potrebic
c1b4899e07
Fix dupe uuid check on entity add (#6735) 2021-10-31 15:09:39 -07:00
HexedHero
744dd8ce79
Allow spawners to be disabled without adding a stupid high tick rate (#6837) 2021-10-31 08:51:57 +01:00
Finn Künstner
a284e40c70
Updated Upstream (Bukkit/CraftBukkit) (#6848)
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:
9b45fa2f #667: Allow setting BrewEvent results
8c776ddc SPIGOT-6762: ChatPaginator.wordWrap only transfers one modifier
da372966 SPIGOT-4590, SPIGOT-6769: Clarify DamageCause documentation

CraftBukkit Changes:
cef1fda3 #947: Add missing spawn eggs for SpawnEggMeta
eb9a0f34 #945: Allow setting BrewEvent results
2021-10-31 08:34:10 +01:00
Jake Potrebic
f2cb9cbd76
Don't fire EntityZapEvent twice (#6830) 2021-10-25 11:54:21 +02:00
sulu5890
20dea64f63
don't attempt to teleport dead entities (#6832) 2021-10-25 11:38:43 +02:00
Nassim Jahnke
c66adfb39d
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6823)
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:
58c2d3c7 SPIGOT-6771: Help command tab completion does not respect permissions

CraftBukkit Changes:
fd50041d SPIGOT-6768: Remove upper bound on setFreezeTicks

Spigot Changes:
38929296 SPIGOT-6767: Configurable Thunder Chance
2021-10-24 19:38:23 +02:00
Pedro
9472d38f3c
Fix method name for Critical damage (#6813) 2021-10-21 15:11:19 +01:00
stonar96
a1f49e4c60
Fix command suggestion leak (#6592)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-10-21 02:15:18 -07:00
Jason
7a0886180f
AT & Mapping fixes (#6809) 2021-10-21 01:16:31 -07:00
Owen1212055
f47aeafe00
Add Horse Animation API (#5599) 2021-10-20 18:09:42 -07:00
Kacper Płażewski
bb397ba74c
Add critical damage API (#6275) 2021-10-20 18:15:28 -04:00
Jake Potrebic
55ca459515
rename method to getSpawnEgg 2021-10-20 14:41:54 -07:00
BillyGalbreath
9d570042ed
Add ItemFactory#getMonsterEgg API (#6772) 2021-10-20 14:35:52 -07:00
syldium
40ee63496c
Add advancement display API (#6175) 2021-10-20 15:59:13 -04:00
BillyGalbreath
e5f9241d15
Left handed API (#6775) 2021-10-19 20:46:52 -07:00
Bjarne Koll
40057019e0
Correctly inflate villager activation bounding box (#6798) 2021-10-19 20:14:30 -07:00
Jake Potrebic
0a6103597b
Get entity default attributes (#6449) 2021-10-19 18:55:05 -07:00
Shane Freeder
26c37d99d5
create random seeds for features using SecureRandom 2021-10-19 15:25:04 +01:00
Jason
eaee7a2473
Use correct LevelStem registry when loading default end/nether (#6789) 2021-10-17 18:10:03 +01:00
Jake Potrebic
72a3175165
Updated Upstream (Bukkit/CraftBukkit) (#6791) 2021-10-17 17:57:00 +01:00
Jake Potrebic
a55617d9ce
Fix/improve the last upstream update (#6780) 2021-10-16 19:57:05 +01:00
Spottedleaf
c1644521c9 Do not overload I/O threads with chunk data while flush saving
If the chunk count is high, then the memory used by the
chunks adds up and could cause problems. By flushing
every so many chunks, the server will not become
stressed for memory. It will also not increase the total
time to save, as flush saving performs a full flush at
the end anyways.
2021-10-16 02:23:07 -07:00
Jake Potrebic
0a16fb8182
Fix merchant inventories not closing on entity removal (#6544) 2021-10-15 20:19:08 -07:00
Spottedleaf
fc0e6c7e08 Fix off by one for determining server view distance
It was 1 greater than it should've been. lvar renaming
caused the field viewDistance to be read when it should've
been reading the watchDistance
2021-10-15 19:21:27 -07:00
Hannes Greule
3f2159e43c
Unlimited chunk load rate (#6768) 2021-10-15 18:54:46 -07:00
Shane Freeder
5344798579
Clean plugin folder logic in extra-jars patch (Fixes #6347) (#6619) 2021-10-15 22:54:22 +01:00
Shane Freeder
4276013833
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:
9590b610 SPIGOT-6749: Library Loader does not correctly isolate dependencies

CraftBukkit Changes:
11c9299f #940: Fixed a NPE during CraftBlockEntityState#update.
960f3109 #937: Fixes related to unplaced BlockStates and the recent world generation changes.
4faf479e SPIGOT-6754: We ignore any still present TileEntity now when we create a BlockState for a block of type AIR.
a72d5404 SPIGOT-6754: Temporarily restore previous behaviour for tile entities with removed blocks

Spigot Changes:
dc75aca8 Remove redundant 'Log null TileEntity Owner' patch
2021-10-15 12:43:19 +01:00
Jason
8575248648
Use ChatRenderer.defaultRenderer() when legacy events have not modified the format (#6104) 2021-10-13 02:00:40 -07:00
Spottedleaf
56e65fd3a7 Null check isApplicable for CraftBlockEntityState#update
If the update call removed the TE, then isApplicable would
have NPE'd.
2021-10-12 13:35:29 -07:00
Jason
54813dbb21
[ci skip] Misc gradle updates (#6763) 2021-10-11 14:31:53 -07:00
Owen1212055
4a0d935cd0
Always allow item changing in EntityFireball (#5493) 2021-10-09 14:04:22 -07:00
Noah van der Aa
cd610df101
Re-readd root/admin user detection (#6703)
* Re-readd root/admin user detection

* I am dum

* Only run id command if needed

* Use ProcessBuilder

* Link to issue

* Rebase

Co-authored-by: Madeline Miller <mnmiller1@me.com>
2021-10-09 19:29:05 +10:00
Jake Potrebic
a61827df91
VanillaCommandWrapper didnt account for entity senders (#6586) 2021-10-08 20:44:45 -07:00
Jake Potrebic
523a55c609
Fix loading cmds in datapacks (#6641) 2021-10-08 20:39:59 -07:00
Jake Potrebic
381a1462b3
Fix unplaced block states after new chunk gen API (#6747) 2021-10-08 12:06:28 -07:00
Jakub Žáček
b470400d5c
Add methods to find targets for lightning strikes (#6712) 2021-10-08 03:00:03 -07:00
Jake Potrebic
975f2e5104
Filter ip address on join if setting is true (#6748) 2021-10-08 09:30:52 +02:00
Noah van der Aa
0d1e18795b
Fix kicking ops when whitelist is reloaded (MC-171420) (#6742) 2021-10-07 11:11:15 -07:00
Noah van der Aa
cf4af9fd48
Add config setting for logging player ip addresses. (#6342) 2021-10-07 11:02:40 -07:00
Spottedleaf
3391ccf988 Discard out of bounds chunks during regionfile header recalc
The logic cannot even determine what local chunk they should be,
and out of bounds chunks can only occur from external modifications
to the regionfile.

If regionfile recalculation cannot occur, then do not attempt
to retry read actions.

Fixes https://github.com/PaperMC/Paper/issues/6718
2021-10-07 05:50:38 -07:00
Nassim Jahnke
bfe562224e
Fix EntityPortalExitEvent target location
Now uses the proper position and world as well as correct pitch
Fixes #6739

Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-10-07 11:05:49 +02:00
Jake Potrebic
7991c4b431
Fix upstream block state factories (#6738) 2021-10-06 21:11:20 -07:00
HexedHero
a4199412fc
Add download link to the /version command (#6482)
* Add download link to /version command

* Change colors
2021-10-06 17:14:03 +02:00
Nassim Jahnke
0cdeeef91f
Remove unnecessary Velocity repo from server (#6730) 2021-10-06 11:28:35 +02:00
Jake Potrebic
e155002b31
Fix EntityPortalExitEvent not being called (#5617) 2021-10-05 14:19:27 -07:00
Jake Potrebic
fdd5c65423
Fix CraftCriteria defaults map (#6723) 2021-10-05 10:24:36 -07:00
Jason
a3dfe6dca5
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722) 2021-10-04 20:14:11 -07:00
Jake Potrebic
90f717fa5a
Add missing team sidebar display slots (#6690) 2021-10-04 10:31:26 +01:00
chickeneer
7ebf08a6ad
Handle missing Spawn Egg item meta for 1.17 mobs (#6700) 2021-10-04 10:13:19 +02:00
Jason
a978f4122a
Start console thread after PaperConfig & MinecraftServer.console are initialized (#6716) 2021-10-03 15:12:04 -07:00
Jake Potrebic
e14aff9b32
Don't count named piglins and hoglins towards mob cap (#6452) 2021-10-03 18:54:54 +02:00
Jason
e39159134f
Update paperweight to 1.1.12 (#6653) 2021-10-02 18:42:30 -07:00
Jason
bde7b98762
Make legacyRenderer a ViewerUnaware renderer (#6691) 2021-10-02 11:43:03 -07:00
Jake Potrebic
cc38c16e75
Updated Upstream (Bukkit/CraftBukkit) (#6638) 2021-10-02 10:21:49 -07:00
sulu5890
e8830b27e3
Revert "Readd root/admin user detection (#6593)" (#6699)
This reverts commit 45c4f90259.
2021-10-02 17:09:50 +02:00
Noah van der Aa
45c4f90259
Readd root/admin user detection (#6593)
* Readd root/admin user detection

* Use original test for Windows, use UID for unix and add co-author

* Move logging and remove unnecessary reader

* try with resources

* Use Windows security identifiers + reduce size of Unix check

* Remove extra newline at the bottom of the message

* Change wording

* Address comments

* Link to Maddy's article

* Use warning log level
2021-10-02 19:34:07 +10:00
Jake Potrebic
f905057070
Prevent unintended light block manipulation (#6601) 2021-10-01 13:07:59 +02:00
thamid-gamer
ebfd70b289
Use null for null resource pack prompts (#6572) 2021-09-30 17:56:22 -07:00
Owen1212055
4a27a4a4d9
Update head rotation in missing places (#5481) 2021-09-30 17:50:00 -07:00
thamid-gamer
00322368c5
Make Levels Use Correct Spawn Settings (#6419) 2021-09-30 17:46:37 -07:00
Lexi
6703c13a8a
Preserve overstacked loot (#5943) 2021-09-30 17:39:17 -07:00
Jake Potrebic
425edfa5d7
More CommandBlock API (#5746) 2021-09-30 14:28:02 -07:00
Jason
3b2b835240
Fix click event when vanilla scoreboard name coloring is enabled (#6652) 2021-09-30 11:33:19 -07:00
Jake Potrebic
fce79051cc
Option to prevent NBT copy in smithing recipes (#6671) 2021-09-30 11:27:25 -07:00
Jason
8ee9bdd6ff
Fix stacktrace deobf where thrownProxy got initialized before rewriting (#6684) 2021-09-30 11:05:51 -07:00
booky10
2b404b0cfa
Fix nullability on Block#breakNaturally (#6651) 2021-09-30 10:42:44 -07:00
Jason
ce1e7e810a
Fix jline relocation (#6677) 2021-09-29 09:34:16 -07:00
Nassim Jahnke
3e3cea1a76
Ensure valid vehicle status (#6673) 2021-09-28 10:24:25 +02:00
Jake Potrebic
6de48dbdda
Fix player death kept items not being in same slot (#6663) 2021-09-25 12:06:37 -07:00
Gaider10
d0a2193d4a
Fix interaction pos in range check (#6654) 2021-09-24 10:02:14 +02:00
Kezz
397349e0aa
Adventure 4.9.1 (#6634)
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-09-23 14:07:44 -07:00
Jake Potrebic
1707c10395
fixes cancelling PlayerTradeEvent (#5612) 2021-09-22 21:10:35 -07:00
Jake Potrebic
f4f5a76e2a
Fix anvil inventory events (#6157) 2021-09-22 15:52:43 -07:00
Bjarne Koll
9460497d71
Apply furnace cook speed multiplier through event (#6378)
Previously the upstream FurnaceStartSmeltEvent would default to the
recipes cooking time, ignoring any modifications from the furnace speed
multiplier.
While this works correctly for upstream, paper introduces the speed
multiplier API, which allows a different cook time from the one provided
by the recipe.

This commit now passes the modified cooktime to the furnace start smelt
event explicitly, instead of allowing the event to default to the
recipes cooking time, thus ensuring that the speed modifier is
respected.

Resolves: #6376
2021-09-22 12:46:15 -07:00
Jake Potrebic
caa4780282
Add more component name methods (#6578) 2021-09-22 11:34:40 -07:00
Jake Potrebic
7ac51f9c15
Include slot when constructing the bukkit Attribute Modifiers (#6537) 2021-09-22 10:48:03 -07:00
Jake Potrebic
655cd8f638
Fix upstreams fix for composters and variable hoppers (#6563) 2021-09-22 10:40:45 -07:00
Nassim Jahnke
aad7d376a8
Fix axolotl/fish persistence
Fixes #6643
2021-09-22 13:40:13 +02:00
Jake Potrebic
9087993feb
Mark fish and axolotls from buckets as persistent (#6392) 2021-09-21 21:59:19 -07:00
Maddy Miller
f75636b55f
[ci skip] Update my name in author field (#6625) 2021-09-20 19:30:04 +10:00
cs8425
0680f4f448
fix per-player-mob-spawns cause total limit cap by Bukkit's spawn limit (#6574) 2021-09-16 17:40:34 -07:00
Jason
ce7516d853
Fix global limit display for MISC mob category (#6612) 2021-09-16 14:40:11 -07:00
PureGero
3069eaee04
Fix tick rates map being stored with upper case values instead of lower case (#6587) 2021-09-15 17:03:09 +10:00
Jason
89c648bcd7
Fix log message formatting when classes not owned by plugins use sysout (#6604) 2021-09-14 10:23:56 -07:00
Noah van der Aa
79e52a51bd
Don't log if debug logging isn't enabled. (#6603) 2021-09-14 16:44:06 +02:00
Nassim Jahnke
7a59345eb7
Hide feature seeds in Timings 2021-09-14 15:31:45 +02:00
Nassim Jahnke
810d200bb4
Improve interact distance check (#6591) 2021-09-11 22:18:44 +02:00
Nassim Jahnke
06db5d08b0
Updated Upstream (Bukkit/CraftBukkit) (#6589)
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:
44cfe143 SPIGOT-6249: Add Missing Effect Constants

CraftBukkit Changes:
14928261 SPIGOT-6249: Add Missing Effect Constants
332335e1 SPIGOT-6731: "Nag author" message in CraftServer lists one author only
6cd975d0 SPIGOT-5732, SPIGOT-6387: Overhaul Hanging entities
2021-09-11 19:27:48 +02:00
Finn Künstner
d060913a61
[ci skip] Fix typos in Paper comments (#6588)
* //Paper -> // Paper

* // Tuiniy -> // Paper
2021-09-11 12:22:51 +02:00
Jason
8a2b23a6a4
Remove method rename and fix reobf for Goal#getFlags (#6528) 2021-09-09 10:12:22 -07:00
Jason
1b383d7e9b
Fix VanillaGoals when in reobfuscated environment (#6580) 2021-09-09 09:57:16 -07:00
Spottedleaf
c3d50184eb Do not create nether portals that delete undestroyable blocks
Fixes https://github.com/PaperMC/Paper/issues/5773
2021-09-07 15:10:48 -07:00
Shane Freeder
295703efb6 Fixup enderpearl patch 2021-09-07 22:33:28 +01:00
Shane Freeder
310c718ed5 Fix CocaoDecorator causing a crash during generation (Fixes #6028) 2021-09-07 21:41:54 +01:00
Omer Uddin
04324c58b2 Disable enderpearls when they hit non-ticking chunk if disableEnderpearlExploit is enabled 2021-09-07 21:21:31 +01:00
Nassim Jahnke
5960af9d87
Updated Upstream (Bukkit/CraftBukkit) (#6568)
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:
7da4c0be SPIGOT-6729: Add Chunk.isEntitiesLoaded()

CraftBukkit Changes:
9217b523 #929: Call EntityBlockFormEvent for Wither Rose placed by dead entity
757d42ae SPIGOT-6729: Add Chunk.isEntitiesLoaded()
2021-09-06 11:26:47 +02:00
Jason
910a1ff9f7
Add '/paper mobcaps' and '/paper playermobcaps' commands (#6470)
Add commands to get the mobcaps for a world, as well as the mobcaps for
each player when per-player mob spawning is enabled.

Also has a hover text on each mob category listing what entity types are
in said category
2021-09-05 14:29:02 -07:00
Nassim Jahnke
6fa1983e9c
Use BlockPost#atY in end portal softlock fix 2021-09-03 20:14:29 +02:00
Noah van der Aa
3562558d62
Prevent softlocked end exit portal generation (#6525) 2021-09-03 20:05:01 +02:00
Nassim Jahnke
cc6fd371b2
Remove "Auto fix bad Y levels on player login" patch
Fixes #6357
Closes #6508
Closes #6358
2021-09-03 19:57:21 +02:00
Jake Potrebic
5c7da5536b
Prevent an infinite recursion error while rendering translatables (Fixes #6551) (#6555) 2021-09-03 18:01:05 +01:00
Shane Freeder
f6a1cb21c5 Do not process entity loads in CraftChunk#getEntities (Fixes #6543)
This re-introduces the issue behind #5872 but fixes #6543
The logic here is generally flawed however somewhat of a nuance,
upstream uses managedBlock which is basically needed to process
the posted entity adds, but, has the side-effect of processing any
chunk loads which has the naunce of stacking up and either causing a
massive performance hit, or can potentially lead the server to crash.

This issue is particularly noticable on paper due to the cumulative efforts
to drastically improve chunk loading speeds which means that there is much more
of a chance that we're about to eat a dirtload of chunk load callbacks, thus
making this issue much more of an issue
2021-09-03 15:55:22 +01:00
Spottedleaf
1276bd5039
Fixed layers from V2550 not being added to list (#6541)
Note from Spottedleaf:
Please note that this doesn't fix any problems using dataconverter
because dataconverter does not re-route world gen settings conversion.

Co-authored-by: Callum Seabrook <callum.seabrook@prevarinite.com>
2021-09-01 21:25:25 +00:00
Jake Potrebic
f02d3d8989
flattener should try to render custom translations (#6540) 2021-09-01 21:03:00 +00:00
Nassim Jahnke
ca708a0944
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6539)
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:
ed7bba95 SPIGOT-6547: Chunk#getEntities() doesn't return all entities immediately after chunk load
d99a585c SPIGOT-6719: Add getTileEntities() to LimitedRegion

CraftBukkit Changes:
422cec08 Rebuild patch
15f27fc7 SPIGOT-6547: Chunk#getEntities() doesn't return all entities immediately after chunk load
cbd747af SPIGOT-6719: Add getTileEntities() to LimitedRegion

Spigot Changes:
6c1c1b26 Rebuild patches
2021-09-01 14:03:36 +02:00
Nassim Jahnke
7bd7b18811
Configurable feature seeds (#6531)
Co-authored-by: Thonk 30448663+ExcessiveAmountsOfZombies@users.noreply.github.com

Also includes an option to auto-generate random seeds for all features and add them to the config.
2021-09-01 09:54:41 +00:00
Spottedleaf
a615186502
Remove the old updatingChunks and visibleChunks fields (#6535)
Just in case they cause problems again.

Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
2021-08-31 19:33:14 -07:00
Jason
2973e1c56e
Always use updatingChunks for saveAllChunks (#6534) 2021-09-01 00:53:56 +00:00
Jason
14be4180f6
Use updatingChunks for flush saving (#6533) 2021-08-31 17:23:22 -07:00
Nassim Jahnke
2cd4bcfba1
Fix distance map contains (#6530) 2021-08-31 12:47:00 +00:00
Spottedleaf
7d10cdea03
Merge tuinity (#6413)
This PR contains all of Tuinity's patches. Very notable ones are:

- Highly optimised collisions
- Optimised entity lookups by bounding box (Mojang made regressions in 1.17, this brings it back to 1.16)
- Starlight https://github.com/PaperMC/Starlight
- Rewritten dataconverter system https://github.com/PaperMC/DataConverter
- Random block ticking optimisation (wrongly dropped from Paper 1.17)
- Chunk ticking optimisations
- Anything else I've forgotten in the 60 or so patches

If you are a previous Tuinity user, your config will not migrate. You must do it yourself. The config options have simply been moved into paper.yml, so it will be an easy migration. However, please note that the chunk loading options in tuinity.yml are NOT compatible with the options in paper.yml. 

* Port tuinity, initial patchset

* Update gradle to 7.2

jmp said it fixes rebuildpatches not working for me. it fucking better

* Completely clean apply

* Remove tuinity config, add per player api patch

* Remove paper reobf mappings patch

* Properly update gradlew

* Force clean rebuild

* Mark fixups

Comments and ATs still need to be done

* grep -r "Tuinity"

* Fixup

* Ensure gameprofile lastaccess is written only under the state lock

* update URL for dataconverter

* Only clean rebuild tuinity patches

might fix merge conflicts

* Use UTF-8 for gradlew

* Clean rb patches again

* Convert block ids used as item ids

Neither the converters of pre 1.13 nor DFU handled these cases,
as by the time they were written the game at the time didn't
consider these ids valid - they would be air. Because of this,
some worlds have logspam since only DataConverter (not DFU or
legacy converters) will warn when an invalid id has been
seen.

While quite a few do need to now be considered as air, quite a lot
do not. So it makes sense to add conversion for these items, instead
of simply suppressing or ignoring the logs. I've now added id -> string conversion
for all block ids that could be used as items that existed in the game
before 1.7.10 (I have no interest in tracking down the
exact version block ids stopped working) that were on
https://minecraft-ids.grahamedgecombe.com/

Items that did not directly convert to new items will
be instead converted to air: stems, wheat crops, piston head,
tripwire wire block

* Fix LightPopulated parsing in V1466

The DFU code was checking if the number existed, not if it
didn't exist. I misread the original code.

* Always parse protochunk light sources unless it is marked as non-lit

Chunks not marked as lit will always go through the light engine,
so they should always have their block sources parsed.

* Update custom names to JSON for players

Missed this fix from CB, as it was inside
the DataFixers class.

I decided to double check all of the CB changes again:

DataFixers.java was the only area I missed, as I had inspected all
datafixer diffs and implemented them all into DataConverter. I also
checked Bootstrap.java again, and re-evaluated their changes. I had
previously done this, but determined that they were all bad.

The changes to make standing_sign block map to oak_sign block in
V1450 is bad, because that's not the item id V1450 accepts. Only
in 1.14 did oak_sign even exist, and as expected there is a converter
to rename all existing sign items/blocks.

The fix to register the portal block under id 1440 is useless, as
the flattenning logic will default to the lowest registered id - which
is the exact blockstate that CB registers into 1440. So it just
doesn't do anything.

The extra item ids in the id -> string converter are already added,
but I found this from EMC originally.

The change for the spawn egg id 23 -> Arrow is just wrong,
that id DOES correspond to TippedArrow, NOT Arrow. As
expected, the spawn egg already has a dedicated mapping for
Arrow, which is id 10 - which was Arrow's entity id.

I also ported a fix for the cooked_fished id update. This doesn't
really matter since there is already a dataconverter to fix this,
but the game didn't accept cooked_fished at the time. So I see
no harm.

* Review all converters and walkers

- Refactor V99 to have helper methods for defining entity/tile
  entity types
- Automatically namespace all ids that should be namespaced.
  While vanilla never saved non-namespaced data for things that
  are namespaced, plugins/users might have.
- Synchronised the identity ensure map in HelperBlockFlatteningV1450
- Code style consistency
- Add missing log warning in V102 for ITEM_NAME type conversion
- Use getBoolean instead of getByte
- Use ConverterAbstractEntityRename for V143 TippedArrow -> Arrow
  rename, as it will affect ENTITY_NAME type
- Always set isVillager to false in V502 for Zombie
- Register V808's converter under subversion 1 like DFU
- Register a breakpoint for V1.17.1. In the future, all final
  versions of major releases will have a breakpoint so that
  the work required to determine if a converter needs a breakpoint
  is minimal
- Validate that a dataconverter is only registered for a version
  that is registered
- ConverterFlattenTileEntity is actually ConverterFlattenEntity
  It even registered the converters under TILE_ENTITY, instead of
  ENTITY.
- Fix id comparison in V1492 STRUCTURE_FEATURE renamer
- Use ConverterAbstractStatsRename for V1510 stats renamer
  At the time I had written that class, the abstract renamer didn't
  exist.
- Ensure OwnerUUID is at least set to empty string in
  V1904 if the ocelot is converted to a cat (this is
  likely so that it retains a collar)
- Use generic read/write for Records in V1946
  Records is actually a list, not a map. So reading map was
  invalid.

* Always set light to zero when propagating decrease

This fixes an almost infinite loop where light values
would be spam queued on a very small subset on blocks.

This also likely fixes the memory issues people were
seeing.

* re-organize patches

* Apply and fix conflicts

* Revert some patches

getChunkAt retains chunks so that plugins don't spam loads
revert mc-4 fix will remain unless issues pop up

* Shuffle iterated chunks if per player is not enabled

Can help with some mob spawning stacking up at locations

* Make per player default, migrate all configs

* Adjust comments in fixups

* Rework config for player chunk loader

Old config is not compatible. Move all configs to be
under `settings` in paper.yml

The player chunk loader has been modified to
less aggressively load chunks, but to send
chunks at higher rates compared to tuinity. There are
new config entries to tune this behavior.

* Add back old constructor to CompressionEncoder/Decoder (fixes
 Tuinity #358)

* Raise chunk loading default limits

* Reduce worldgen thread workers for lower core count cpus

* Raise limits for chunk loading config

Also place it under `chunk-loading`

* Disable max chunk send rate by default

* Fix conflicts and rebuild patches

* Drop default send rate again

Appears to be still causing problems for no known reason

* Raise chunk send limits to 100 per player

While a low limit fixes ping issues for some people, most people
do not suffer from this issue and thus should not suffer from
an extremely slow load-in rate.

* Rebase part 1

Autosquash the fixups

* Move not implemented up

* Fixup mc-dev fixes

Missed this one

* Rebase per player viewdistance api into the original api patch

* Remove old light engine patch part 1

The prioritisation must be kept from it, so that part
has been rebased into the priority patch.
Part 2 will deal with rebasing all of the patches _after_

* Rebase remaining patches for old light patch removal

* Remove other mid tick patch

* Remove Optimize-PlayerChunkMap-memory-use-for-visibleChunks.patch

Replaced by `Do not copy visible chunks`

* Revert AT for Vec3i setX/Y/Z

The class is immutable. set should not be exposed

* Remove old IntegerUtil class

* Replace old CraftChunk#getEntities patch

* Remove import for SWMRNibbleArray in ChunkAccess

* Finished merge checklist

* Remove ensureTickThread impl in urgency patch

Co-authored-by: Spottedleaf <Spottedleaf@users.noreply.github.com>
Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-08-31 04:02:11 -07:00
Jason
6e9f38ea91
[ci skip] Cleanup Timings v2 diff (#6523) 2021-08-30 00:02:24 -07:00
Jason
cf27619809
Log error for invalid entity-per-chunk-save-limit configs (#6522) 2021-08-29 21:19:43 -07:00
Nassim Jahnke
be269d1cf0
Move ProtoWorld methods to LimitedRegion (#6486) 2021-08-28 13:43:26 +00:00