Commit Graph

164 Commits

Author SHA1 Message Date
epserv
8b641bc823
Merge branch 'staging/1.16.5' into patch-mappalette 2021-03-09 21:50:12 +05:00
Simon Gardling
81be654167 Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-02-22 14:15:07 -05:00
ishland
124113a289
Remove hydrogen port (#415) 2021-02-20 18:34:01 +08:00
Simon Gardling
c18ae50aab
Updated Upstream and Sidestream(s) (Paper/Tuinity/Purpur/Airplane/Empirecraft) (#412)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
0ea308381 Updated Upstream (Bukkit/CraftBukkit)

Tuinity Changes:
a539774 Fix off-by-one for BasicEntityList
0763cd1 Updated Upstream (Paper)
ad35543 Various optimisations
2006b9b Discord vanity URL

Purpur Changes:
4086888 [ci-skip] Fix formatting issue in previous commit
70ec0e2 Updated Upstream (Paper & Tuinity)
d7d72b3 Remove unused event from api
6ec1ed7 [ci-skip] hmm

Airplane Changes:
7dc1546 Updated Upstream (Tuinity)
04fd4dc Updated Upstream (Tuinity)

Empirecraft Changes:
586aef63 Prevent grindstones from overstacking items
4cf96630 Updated Paper
2021-02-19 14:39:10 -05:00
Simon Gardling
e8c6ab6a0b Merge branch 'ver/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-02-17 11:48:48 -05:00
Simon Gardling
c5f892d7b2
Updated Upstream and Sidestream(s) (Tuinity/Empirecraft) (#408)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
2dfd22e Fix incorrect isRealPlayer init
e5f54a3 Fix chunks refusing to unload at low TPS
4415b59 Improve behavior for hard colliding entities

Empirecraft Changes:
e8696c6d Updated Paper
1a4a079b Fix names in script (#9)
2021-02-16 12:29:28 -06:00
Simon Gardling
d11f37a964
remove 0022-Add-JsonList-save-timings.patch (#400) 2021-02-15 22:14:03 -05:00
epserv
f58ea4a9da Merge branch 'ver/1.16.5' into patch-mappalette 2021-02-16 00:15:35 +05:00
Simon Gardling
ea57879429 Merge branch 'staging/1.16.5' of github.com:YatopiaMC/Yatopia into staging/1.16.5 2021-02-15 14:11:01 -05:00
Simon Gardling
26f81c9e89
Cadmium + LazyDFU port (#383) 2021-02-15 12:18:55 -05:00
ishland
16e2fd38b6
Drop MyPet fix (#396) 2021-02-15 12:17:57 -05:00
Simon Gardling
9f3986a30b
Updated Upstream and Sidestream(s) (Paper/Purpur) (#404)
* Updated Upstream and Sidestream(s) (Paper/Purpur)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
088fa6f28 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)

Purpur Changes:
a8c9e3d Add unsafe Entity serialization API (#139)
631520c Add ender crystal explosion options (#168)
3880ddf Config to always tame in Creative (#166)
9ae031c Updated Upstream (Paper)
006e47f Fix #167 `persistent-droppable-entity-display-names` renames lead on named mobs
ec81b87 Update Gradle to 6.8.2

* Updated Upstream and Sidestream(s) (Purpur)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Purpur Changes:
b15a2e9 Add ghast allow-griefing option

* Updated Upstream and Sidestream(s) (Purpur)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Purpur Changes:
9537c77 Add phantom allow-griefing option
2021-02-15 10:10:34 -06:00
Simon Gardling
f295cbb0ed
Updated Upstream and Sidestream(s) (Airplane) (#403)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Airplane Changes:
e71967b Spelling error
5ffdcdb Merge branch 'perf/reduce-allocs'
5f350d7 Minimize shouldDoLightning for inlining
271a374 Reduce memory allocations
2021-02-12 21:01:32 -05:00
Simon Gardling
4527fdcbbf
Updated Upstream and Sidestream(s) (Paper/Purpur/Airplane) (#398)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Purpur Changes:
be941d8 Updated Upstream (Paper)
e968763 Vanilla snowman now drops pumpking when sheared

Airplane Changes:
a1d0b30 Merge branch 'master' of github.com:Technove/AirplaneLite
a84798e Disable Paper timings by default
fac3db8 Create funding.yml
360636b Merge in perf/misc

Paper Changes:
bd7c1d88b Merchant#getRecipes should return an immutable list (#5183)
2021-02-11 12:41:36 -05:00
Simon Gardling
36030ef022
Updated Upstream and Sidestream(s) (Paper/Tuinity/Purpur/Airplane/Empirecraft) (#392)
* Updated Upstream and Sidestream(s) (Paper/Tuinity/Purpur/Airplane/Empirecraft)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
13a476e15 Deprecate PlayerLeaveBedEvent#setBedSpawn
3a1d95c71 [Auto] Updated Upstream (CraftBukkit)
d4dcc1a2e Updated Upstream (CraftBukkit)
e886d8118 Updated Upstream ()
8bc0c6c31 Updated Upstream (CraftBukkit/Spigot) (#5169)
002f65b8b living entity allow attribute registration (#4723)
69a5c67b1 fix calling setSize on dead slimes causing invincibility (fixes #5137) (#5168)

Tuinity Changes:
502d57b Updated Upstream (Paper)
87e0cd9 Print exceptions for light scheduling

Purpur Changes:
7fc2d31 Updated Upstream (Paper & Tuinity)

Airplane Changes:
d7d1626 Remove multithreaded entity tracker
677ec73 Ensure armor change event is on main thread
c07d254 Fix crash
ec7605c Updated Upstream (Tuinity)
2768f39 Update DEAR commit message
e975972 Multithreaded entity tracking
98244f9 Updated Upstream (Tuinity)
44b2499 Larger headings
2c4a7fb Merge pull request #6 from Encode42/master
cc19631 More changes
beba27a Badges and variables
0aeaf12 Improve readability, grammar, etc.

Empirecraft Changes:
bbc8d297 Updated Paper

* Updated Upstream and Sidestream(s) (Paper/Origami)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
3dadd97bb [CI-SKIP] [Meta] Exempt more labels from being marked as stale (#5142)
36a72cad3 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)

Origami Changes:
168394a Access config after loading it... fixes velocity auto offline-mode
c47b182 Add velocity to automatic offline mode
2021-02-08 10:31:51 -05:00
Simon Gardling
b774a5d8a8
Updated Upstream and Sidestream(s) (Purpur/AirplaneLite) (#389)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Purpur Changes:
5cff60d Toggle for water sensitive mobs getting damaged by... water (#161)

AirplaneLite Changes:
1b11269 This works, last time
f763e5b Keep one patch
ca87ae0 Keep empty API directory
53d0334 Rebrand as "Airplane"
1e153e0 Merge pull request #3 from DeadSteve51/patch-1
0829860 Remove actions links
12cc4d7 Adds more info to the README, mostly from the Discord
a78a63c Add new downloads URL
2a05c35 Force workflow run
2021-02-05 11:57:30 -05:00
ishland
6f638c7944
Fix NPE in ControllerLookWASD and ControllerMoveWASD (#380)
Resolves https://github.com/YatopiaMC/Yatopia/issues/379
Related to https://github.com/xXKeyleXx/MyPet/issues/1425
2021-02-03 08:02:43 +08:00
Simon Gardling
021f928c4d
Updated Upstream and Sidestream(s) (Paper/Purpur/AirplaneLite/Origami) (#382)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
0514fc4e2 Add missing effects
8f5d9effd Add getMainThreadExecutor to BukkitScheduler
313b5020b Allow adding items to BlockDropItemEvent (#5093)
9a556d9da [CI-SKIP] [Auto] Rebuild Patches
72b2768ad Inline shift fields in EnumDirection (#5082)
ffff53fa7 added option to disable pathfinding updates on block changes (#5123)
b67081fd7 add DragonEggFormEvent (fixes #5110) (#5112)
3eefafbaf Fix javadoc build
0081ed1c4 Add javadoc step to GH Actions
01082503e Add dropLeash variable to EntityUnleashEvent (#5130)
31f9f869a [CI-SKIP] Fix YourKit links in readme, fixes #5091
8ac27aa38 [Auto] Updated Upstream (CraftBukkit)
c4d9cc831 [Auto] Updated Upstream (Bukkit/CraftBukkit)
d0477d326 [Auto] Updated Upstream (CraftBukkit)
d9f5f7018 EntityMoveEvent (#4614)

Purpur Changes:
e581a73 Updated Upstream (Paper)

AirplaneLite Changes:
10c5810 Updated Upstream (Tuinity)

Origami Changes:
45d89cc Update Paper
578ef16 Automatically disable online-mode if bungeecord is enabled
de51baa Update Paper
5986aef Import Purpur patch to not send useless entity packets
2021-02-02 10:17:46 -05:00
ishland
c2fd399caf
Merge staging/1.16.5 (#371)
* add config for sand duping (#352)

* Lithium: cache chunk gen sea level (#349)

based off: a55cfd1c91

* PaperPR: Inline shift fields in EnumDirection (#350)

* Introducing: Yatoclip (#360)

* New async nbt cache (#347)

* update pom

* whoops

* Try to address path issue and improve Jenkins build speed

* Detailed lag and crash reports (#369)

Added "Suspected Plugins" to Watchdog and crash reports

* Drop sand duping

* Add branch specific versions

* Remove copyright

* Revert mysql-connector-java version bump

* Small fixes

* More detailed lag and crash reports

* Don't use branch information when generating metadata

* Fix Jenkins Builds version command

* Fixup patches

* Fix patch notes

* Pull Request compatibility for branch detection

* Fix Pull Request compatibility for branch detection

* Set context classloader before launch

* Inject server jar to SystemClassLoader before launch

* Try fix compile in java8

* Run tests on CodeMC and Github Actions

Co-authored-by: Simon Gardling <Titaniumtown@gmail.com>
Co-authored-by: Zoe <duplexsys@protonmail.com>
Co-authored-by: Hugo Planque <12386279+HookWoods@users.noreply.github.com>
2021-02-01 18:44:34 +08:00
ishland
2a411ec655
Preload ProtocolLib EnumWrappers (#368)
See patch notes
2021-01-27 23:53:05 +08:00
ishland
478b88dc35
Use ObjectArrayList in CraftingManager and clear recipes before reload (#367)
Fixes https://github.com/YatopiaMC/Yatopia/issues/366
2021-01-27 23:52:45 +08:00
ishland
49133cb643
Compatibility fixes (#363)
* Retain BiomeStorage vanilla compatibility

* remove networking patches

Co-authored-by: Simon Gardling <titaniumtown@gmail.com>
2021-01-26 11:17:41 -05:00
Simon Gardling
d059af01b6
Updated Upstream and Sidestream(s) (Paper/Purpur/AirplaneLite) (#362)
* Updated Upstream and Sidestream(s) (Paper/Purpur/AirplaneLite)

Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Paper Changes:
fc4c0bc42 Reset shield blocking on dimension change
1c8b6065e Skip distance map update when spawning is disabled
091e6700f Added PlayerStonecutterRecipeSelectEvent
fc885f966 Add toggle for always placing the dragon egg
b3a6da3a7 Updated Upstream (Bukkit/CraftBukkit)
18ccc062d [Auto] Updated Upstream (Spigot)

Purpur Changes:
df9bd08 Config to use infinity bows without arrows (#149)
9d537bc Fix PlayerEditBookEvent not saving new book
3f8816d [ci-skip] Oops
5508728 [ci-skip] Add granny to funding
4c7ab70 Updated Upstream (Paper)
5eefb52 [ci-skip] Update Gradle to 6.8.1

AirplaneLite Changes:
459bb20 Remove patch
515fec7 Remove streams
fc94d7b Correct launcher name
0b153bd Update gradle version

* add Remove-streams.patch from AirplaneLite
2021-01-25 13:22:51 -06:00
Simon Gardling
620a24c155
revert revert-improve-task-performance (#361) 2021-01-25 11:01:30 -05:00
ishland
aebd71f724
Drop Unsafe UUID & Proxy Data Patches (#357) 2021-01-24 23:52:19 +08:00
Hugo Planque
b27d77ca49
New network system (#340)
* New network system

* Revert code readability

* Change comment style

* Bring the patch to standarts

* Fix astei's nickname

Sorry

* Remove explicit logging

* Adapt FastThreadLocalThread

* Add new network optimisation and cleanup useless import

* Port krypton

* Minimize diff

* Some bug fixe

* Fix typo

* Fix mail adress

Co-authored-by: Hugo Planque <hookwood@pop-os.localdomain>
Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
Co-authored-by: Zoe <duplexsys@protonmail.com>
2021-01-23 12:57:49 -06:00
Hugo Planque
ebf26c2f82
Port hydrogen to Yatopia (#344)
* Port hydrogen to Yatopia

* Update license and readme

* Fix patches credits

* Fix dumb code

* Configure intellij to stop importing *

* Fix credits that got reverted

* Properly update

* Minimize diff

Co-authored-by: Hugo Planque <hookwood@pop-os.localdomain>
Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
2021-01-23 12:47:55 -06:00
Ivan Pekov
6559aa88e5
Merge branch 'ver/1.16.5' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2021-01-21 18:20:21 +02:00
Zoe
985b5655f5
Use modified toothpick for our build & patch system.
This has been in work for a bunch of time. Zoe ( duplexsystem or budgidiere, whatever ) has put a ton of work into this. 
We now have a bugfree build system that works flawlessly. 

Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
Co-authored-by: Simon Gardling <titaniumtown@gmail.com>
Co-authored-by: toinouH <toinouh2003@gmail.com>

P.s the one who merged this is ivan and not bud.
2021-01-21 12:58:52 +02:00
Ivan Pekov
ced85132f5
Replace all references to codemc.org with codemc.io
this should fix the build problems @ codemc
2021-01-21 10:17:19 +02:00
Simon Gardling
19b1495d69
Add config option for logging login location (#346) 2021-01-21 07:47:05 +02:00
Ivan Pekov
0c43fe2949
Updated Upstream and Sidestream(s) (Tuinity/EMC/Origami/Purpur/AirplaneLite)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
c04b005 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.5
1d169e7 Updated Upstream (Paper)

EMC Changes:
a8914cb8 Remove the ProjectileHitBlockEvent
b8f864b5 Updated Paper
42cd3269 Remove FlowerPotPlantEvent and undeprecate FlowerPotRemoveEvent
64b3edf0 Remove the UUID key for setSpawnedEntity
938c6f1b Convert spawn egg entity tag attributes on creature spawn
4cc80284 Disable entityTag conversion since data version isn't accessible in scope
478d83fe Updated Paper
1e409abf Updated Paper

Origami Changes:
ab42df9 Update Paper

Purpur Changes:
7e8bf66 Updated Upstream (Paper & Tuinity)

AirplaneLite Changes:
3200f2a Add new webhook for notifications
fe01371 Up MC version
c585ff5 Updated Upstream (Tuinity)
2021-01-18 18:40:21 +02:00
Ivan Pekov
e8b98faf4c
Merge branch 'ver/1.16.5' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2021-01-16 09:19:13 +02:00
Ivan Pekov
99e3c5ddd8
Updated Upstream and Sidestream(s) (Tuinity/EMC/Origami/Purpur)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
f4f7929 Updated Upstream (Paper)

EMC Changes:
bdbacfb3 Updated Paper
a59be75b Convert item name/lore at time of creation properly

Origami Changes:
eb7662a Fix legacy code being accessible when disabling legacy support

Purpur Changes:
7356e48 Fix stuck in portals
7f4c8f8 Updated Upstream (Paper)
2021-01-15 16:20:46 +02:00
Ivan Pekov
87420d4569
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2021-01-07 17:53:28 +02:00
Ivan Pekov
3770a43472
Updated Upstream and Sidestream(s) (Tuinity/Purpur/AirplaneLite)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
33b3f86 Updated Upstream (Paper)
4743c34 Updated Upstream (Paper)

Purpur Changes:
5c0dbf1 [ci-skip] Easier way to remove tuinity's revert of MC-4
424fcf1 Updated Upstream (Paper & Tuinity)
b3644cc Fix rotating UP/DOWN CW and CCW
fbb74cd Updated Upstream (Paper)

AirplaneLite Changes:
5e8ebc0 Updated Upstream (Tuinity)
2021-01-07 17:09:35 +02:00
Ivan Pekov
2b156e3c9c
Updated Upstream and Sidestream(s) (Tuinity/Origami/Purpur)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
abeafb0 Updated Upstream (Paper)

Origami Changes:
e204bb8 Update Paper

Purpur Changes:
c7b279f Updated Upstream (Paper & Tuinity)
2021-01-05 19:21:38 +02:00
Ivan Pekov
548b666d62
Some entity optimisations
Optimised halloween checker and some smol optimisations.
2021-01-04 20:45:19 +02:00
Ivan Pekov
63ce6fbe16
PaperPR - Fix username connecting with no texture being overwritten by usercache 2021-01-04 10:51:42 +02:00
Ivan Pekov
adb131f051
Updated Upstream and Sidestream(s) (Tuinity/EMC/Purpur/AirplaneLite)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
2325c36 Updated Upstream (Paper)

EMC Changes:
a841b5a5 Fix more lore/item name issues (fixes witch gem issue)
1abb3fae Ensure server conversions on ExactChoice ingredients
f2f9d2b0 Forgot to commit paper ref
388620d5 Updated Paper
7a0ae67b Add a null check for UUID to prevent npe later
9de409e0 Updated Paper
0d09eb9a Add new Empire Server API for managing fake players for the tablist

Purpur Changes:
da95725 Updated Upstream (Tuinity)
7194a16 Updated Upstream (Paper)
77373ea Updated Upstream (Tuinity)
0bae78d Drop async advancements patch for now

AirplaneLite Changes:
7b4acbe h != k
a07e80c Whoops, missed paperclip change
845c191 Add license to patch files
fa671b7 Allow gradle wrapper in gitignore
04fc820 Rework strip raytracing patch
f48f6b2 Updated Upstream (Tuinity)
ec7c6df Fix encoding
9326301 Update upstream, fix utf8
20b8c79 Allow gradle wrapper in gitignore
6cd80e9 Updated Upstream (Tuinity)
2021-01-03 13:41:36 +02:00
Ivan Pekov
011dd344e4
Add a special case for floodgate and offline uuids
floodgate spoofs uuids, but plugins such as luckperms get the uuid that the server uses, causing problems
if this option is configured properly, such things won't happen
2020-12-29 08:52:57 +02:00
Ivan Pekov
fe305faa92
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-27 08:48:18 +02:00
Ivan Pekov
aaeb472be2
Drop this shit
I don't have any more nerves to fix this
2020-12-27 08:44:05 +02:00
Ivan Pekov
1890cf9a82
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-26 11:59:49 +02:00
Ivan Pekov
ef7a12601f
Updated Upstream and Sidestream(s) (Tuinity/EMC/Purpur/AirplaneLite)
Upstream/An Sidestream has released updates that appears to apply and compile correctly
This update has NOT been tested by YatopiaMC and as with ANY update, please do your own testing.

Tuinity Changes:
86b20d4 Updated Upstream (Paper)
afd0643 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4
d1db107 Updated Upstream (Paper)

EMC Changes:
d32f7b26 Updated Paper
0650e984 Only retrack passengers if there are passengers in them

Purpur Changes:
5758335 Configurable spawn reinforcements attribute
8849c20 Fix afk broadcast stripped colors
fe73b19 Updated Upstream (Paper)
f3dccd1 [ci-skip] Specify UTF-8 for Javadoc and JavaCompile
7ad2c5d [ci-skip] More attributes work
19ec1c3 [ci-skip] Uh.. I dont even know..
1cb7e4e Add PlayerBookTooLargeEvent
4e8a150 Updated Upstream (Paper)
8cabaae Updated Upstream (Paper & Tuinity)

AirplaneLite Changes:
20b8c79 Allow gradle wrapper in gitignore
6cd80e9 Updated Upstream (Tuinity)
2020-12-24 09:14:21 +02:00
Ivan Pekov
27a7dc2193
Don't unnecessarily copy the passenger list 2020-12-23 10:01:47 +02:00
Ivan Pekov
5c8274bd2f
Port requested patches from Purpur
Ported: TPSBar, custom growth rates and configurable lava speed
2020-12-23 09:46:56 +02:00
Ivan Pekov
89229b4966
GH-322: Return end gateways do not teleport players back to the main end island
Fixes #322
Instead using the idea suggested, I dropped the patch and reimplemented some of the smol stuff in a new one.
2020-12-23 08:50:22 +02:00
Ivan Pekov
a08d6de865
Remove unnecessary diff and patch 2020-12-17 20:26:06 +02:00
Ivan Pekov
0235954074
Merge branch 'ver/1.16.4' of https://github.com/YatopiaMC/Yatopia into patch-mappalette 2020-12-17 10:33:34 +02:00