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:
4fb7f5d Updated Upstream (Paper)
Purpur Changes:
f513a2f Updated Upstream (Paper)
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:
adfab32 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.4
1d4c8fc Updated Upstream (Paper)
48ccd32 Do not retain playerchunkmap instance in light thread factory
Purpur Changes:
4a95a55 Updated Upstream (Paper & Tuinity)
4ba69a2 Add tablist suffix option for afk
28437fe Merge branch 'ver/1.16.4' of github.com:pl3xgaming/Purpur into ver/1.16.4
5796ff9 Updated Upstream (Paper)
d98da39 Update README
b85092b Disable doclint on javadoc generation
ef45666 Updated Upstream (Paper)
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:
ee5df4c Updated Upstream (Paper)
Purpur Changes:
a295636 Updated Upstream (Paper)
ec6e3b3 Updated Upstream (Paper)
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:
f559558 Updated Upstream (Paper)
Purpur Changes:
1eaac71 Updated Upstream (Paper & Tuinity)
137523f Fix allowing color codes in signs
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:
d7f2b6e Updated Upstream (Paper)
0850468 Properly ignite entities that stand in fire
4ff2d15 More cleanup to delay chunk unloads
52f4d08 Cleanup post dev branch merge
f2eef4a Fixup dev branch patches and store reverted patches in revert folder
85aba13 Merge branch 'dev/some-opts'
c3a9e41 Remove deprecated function usage in github actions (#200)
dde7028 Merge branch 'master' into dev/some-opts
083e162 Updated Upstream (Paper) - Update to 1.16.4
576e2cc Rate limit incoming packets
7f251e0 Updated Upstream (Paper)
7d45836 Updated Upstream (Paper)
cff9ec0 Updated Upstream (Paper)
c3d5d24 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
c12d582 Merge branch 'master' into dev/some-opts
cbffdcc Do not mark entities in unloaded chunks as being in blocks
988e550 Updated Upstream (Paper)
84aecdb Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
f7b8e25 Split dev branch
3200930 Merge branch 'master' into dev/some-opts
82e5dfb Updated Upstream (Paper)
d41103d Updated Upstream (Paper)
1d73f6c Updated Upstream (Paper)
8ba1bab Updated Upstream (Paper)
ac6b72e Updated Upstream (Paper)
8d982c4 Updated Upstream (Paper)
2c7bad9 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
903f580 Merge remote-tracking branch 'origin/dev/some-opts' into dev/some-opts
0179ea8 Re-Add region manager and notify patch
6886867 Merge branch 'master' into dev/some-opts
fb292c1 Updated Upstream (Paper)
442890b Fix decompression with Velocity natives (#191)
57fed71 Fix decompression with Velocity natives
102d60b Rebuild patches
968512b Add Velocity natives for encryption and compression (#188)
e2dcdd1 Correct return value for ChunkCache#getCubes
4a99f3e Updated Upstream (Paper)
f5d537e Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
784b838 Some fixes
be0b91f Merge branch 'master' into dev/some-opts
2cb36ca Optimise non-flush packet sending
be68938 Hey git, may I know what happened here?
1cac0a2 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
d72e062 Merge branch 'master' into dev/some-opts
76777f0 Updated Upstream (Paper)
6465aba Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
d82174a Merge branch 'master' into dev/some-opts
460581d Fix getClosestEntity not working
d39cda0 Updated Upstream (Paper)
2110847 Rewrite getClosestEntity
3e45700 Do not return complex parts for entity by class lookup
c9cfdba Updated Upstream (Paper)
5994cb0 Updated Upstream (Paper)
7dfe18c Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
363973d Merge branch 'master' into dev/some-opts
1c05858 Updated Upstream (Paper)
adaafb4 Git merge doesn't update submodules
ab71ded Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
54db338 Merge branch 'master' into dev/some-opts
483289c Updated Upstream (Paper)
e36359e Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2
ef8cd34 Fix NPE
b770af9 Merge branch 'master' into dev/some-opts
d479e12 Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.2
a1b90f8 Merge branch 'master' into dev/some-opts
30c5ca5 Merge branch 'master' into dev/some-opts
e59b60b Updated Upstream (Paper)
09f62a7 Rebuild patches
b041d11 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2
27fca2d Merge branch 'master' into dev/some-opts
a218f5d Updated Upstream (Paper)
f7c5428 Updated Upstream (Paper)
a17dc2c Attempt to fix incorrect nearest village distance tracker updating
8830cef Remove streams for poi searching in some zombie pathfinding
89276ac Fix villagers aggressively looking at people
db64f14 Make sure to despawn entities if they are outside the player general area range
ba0bfda Updated Upstream (Paper)
200f825 Actually unload POI data
3dc7b9e Updated Upstream (Paper)
30f6ca0 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
3b008f5 Optimisations
c628aa4 Updated Upstream (Paper)
1ed41fc Updated Upstream (Paper)
193d9bf Updated Upstream (Paper)
f2ac649 Updated Upstream (Paper)
a63298f Upstream
a12e1f6 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
9eed723 Rebuild patches
d03dbcc Updated paper
c1002c5 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
27084eb Updated paper
bfb0ded Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
763aa6c Updated Upstream (Paper)
49898d0 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
199edf5 Merge branch 'ver/1.16.2' of https://github.com/Spottedleaf/Tuinity into 1.16.2tmp
78bfcfb Update everything
bbbe82e change upstream
EMC Changes:
4da58340 clear more entity tasks with reloads
2f3d567f Improve temp meta reloading
efd7ea89 Updated Paper
25426b02 Updated Paper
35099319 Fix blockbreaknaturally event not always having the loc stored
Purpur Changes:
306e9ac Add missing repos for deps
67be68c Updated Upstream (Tuinity)
cf3e3e7 Fix last patch :3
a43bb36 Arrows should not reset despawn counter
f0b8bd7 Updated Upstream (Paper)
f15d3f0 Updated Upstream (Tuinity)
39ce110 Fix missed obf method rename in Tuinity patches
bae5baa Updated Upstream (Paper)
5569d02 Updated Upstream (Paper)
72c4c5e Updated Upstream (Paper)
7fa8baf Update readme
03654a6 Update to 1.16.4 ^_^
0fa478d Updated Upstream (Paper & Tuinity)
3fec5da Rebuild patches
2f7a0a0 Fix client lag on advancement loading
3f325b8 Fix#86 Move pathfinders into NMS package to satisfy Paper's AI API
7cfd3d7 Updated Upstream (Paper)
cc6c167 Updated Upstream (Paper)
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:
7f251e0 Updated Upstream (Paper)
EMC Changes:
ef2f460b Updated Paper
Closes#257
Ports 2 patches from Purpur: Infinity-bow-settings & Allow-infinite-and-mending-enchantments-together
Added an option for infinity with no arrows too.
Option for custom locale has come! You can put a locale.json file in your server folder to change it.
We've got the finest patches from Hydrinity ( Mykyta approved & allowed ) too.
We have some amazing new options in yatopia.yml, we're gonna have documentation for them soon so stay tuned!
Last but not least, chunk generation patches. We've tested them extensively so no weirdness happens.
Thanks for using Yatopia as your production server software.
Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
Use Chunk.getAsSlices instead to save some cpu time.
getEntitySlices needs to be kept like that to ensure some plugins working properly, otherwise we'd have server owners crying
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:
cff9ec0 Updated Upstream (Paper)
c3d5d24 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
5df4a4f Reset the minimum ticket level for delaying unloads (#196)
Origami Changes:
23fe2d3 Remove unnecessary map patch. Fixed in Paper
faef256 Remove unused stream removal change
3f68c85 Update Paper
Purpur Changes:
1720664 Updated Upstream (Tuinity)
6b2b137 Updated Upstream (Paper)
afed247 Updated Upstream (Paper)
a8a4826 Updated Upstream (Paper)
ca4c502 Updated Upstream (Paper)
686ac09 Updated Upstream (Paper)
49dc495 Allow infinite and mending enchantments together
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:
988e550 Updated Upstream (Paper)
Purpur Changes:
ea7a301 Fix lag
424607f Updated Upstream (Paper)
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:
84aecdb Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
de1983b Updated Upstream (Paper)
EMC Changes:
1499c3fb Un-Merge PlayerInteractEntity and PlayerInteractAtEntity
17184238 Updated Paper
d0715d42 Updated Paper
Purpur Changes:
32b7926 Fix#77 and credit correct author
42d9e8f Updated Upstream (Paper)
5026a31 Controllable minecarts fall damage option and slow down in air fix
d9c0631 Updated Upstream (Paper)
d40fd41 Fix broken /time command
d652384 Updated Upstream (Paper)
86a0769 Configurable daylight cycle
Every recipe (of every recipe type) is now cached in an ArrayList, which will makes accessing all available recipes a ton faster.
This speeds up player joining by ~223843 ns (0.2 ms) since all recipes have already been cached and the stream that would have normally created a Set of all recipes has now been replaced. An ArrayList was chosen for its fast size() method, which makes serialization in PacketPlayOutRecipeUpdate as fast as possible.
- Removed async entity tracking, as this is not a good implementation and has caused issues numerous times
- Removed "0037-Load-also-the-chunk-that-you-re-teleporting-to" as it does not fix the core problem
- Removed "0048-Fix-villager-dupe" as it was deemed unnecessary
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:
82e5dfb Updated Upstream (Paper)
Origami Changes:
7e2a3f6 Update Paper
Purpur Changes:
5cc7709 Make mobs avoid stonecutter blocks
129484a Stonecutter damage
8295d22 Updated Upstream (Paper)
d23a158 Infinity bow settings
5c0a270 Make infinite lava number of required sources configurable
ef17322 Update readme
70e2ec0 Cleanup codebase
81ca45c Flying squids! Oh my!
Fixes bad performance out of the box for production.
Apparently there's another issue which is thinkering our minds up, it is that after certain amount of time the gc just can't keep up. We're investigating into this, but until it is fixed - this is gonna be a stable build
Co-authored-by: Mykyta Komarn <nkomarn@hotmail.com>
Remove more fucked up stream conversions. Also use cached recipe in furnaces when possible, and only lookup when absolutely necessary.
On a server with 8.8K furnaces, the average tick rate was ~0.3-1ms higher when furnaces were burning vs idle furnaces, as compared to ~10ms difference in earlier revisions of these patches.
This drops rainforest's async advancements patch, which was very unsafe, and replaces it with our own optimization patch, which isn't async, but it is enough to lower the pressure upon join.
* Async entity tracking
This is very basic, and I plan to commit the full entity tracker optimizations in the near future.
* Fix compatibility with Citizens
This also simplifies the patch quite a bit
* Make the patch much more safer
* Current progress
Maybe most of those \"ensureMain\" calls are unnecessary, but it has to be tested.
the only problems now are that entities are teleporting instead of normally moving
* Fix entities "teleporting"
* Fixup some of the diff
* Add some notes
Co-authored-by: Ivan Pekov <ivan@mrivanplays.com>
We had some old, faulty stream replacements in place before, which caused a lot of tick lag compared to just using Mojang's streams in vanilla.
Removing these stream replacements lowered average tick from 12ms w/ 1 player online to 3.5ms with 3 players online.
References and benchmarks:
Performance impact in ms: https://imgur.com/a/yuZs5Il
MSPT comparison: https://imgur.com/a/X4hqZ2P
Old, faulty stream replacement flow: https://imgur.com/a/meSXmaJ
Mojang's vanilla streams flow: https://imgur.com/a/9Yf6yQc
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:
d41103d Updated Upstream (Paper)
Purpur Changes:
4984bb7 Updated Upstream (Paper)
a16a79c Updated Upstream (Paper)
bd83a6b Add predicate to recipe's ExactChoice ingredient (missing NMS side)
d469979 Rebuild patches
802a659 Persistent TileEntity Lore & DisplayName
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:
1d73f6c Updated Upstream (Paper)
EMC Changes:
81f5e1fa Updated Paper
faf92d5c Updated Paper
7e1e4bad Update patch name to reflect what actually is being changed
019ceb9f Update patch name for fishing hook api
647b2063 Separate out a patch for using getType in the ItemStack isSimilar method
38734f9b Updated Paper
ac260ccd Update to 1.16.3
4977edff Updated Paper
Purpur Changes:
debedee Add predicate to recipe's ExactChoice ingredient
2459033 Rebuild patches
17d8ee8 Add option to disable zombies pathfinding to villagers only when lagging
1e25c2f Fix typo/error in a purpur world setting
da9953a Updated Upstream (Paper)
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:
8ba1bab Updated Upstream (Paper)
This was causing hoppers to only attempt to suck in items every second. Needless to say, this broke vanilla hopper behavior.
I'll be bringing some better hopper optimizations in the near future.
Fixes#226
All these were doing some kind of weirdness to the chunk generation, thats why they were dropped.
Unfortunately this will decrease performance, but bugs is our priority before speed.
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:
ac6b72e Updated Upstream (Paper)
Origami Changes:
b69a015 Fix pre spawn event shouldAbortSpawn not working correctly for golems
Purpur Changes:
8dfb30b Updated Upstream (Paper & Tuinity)
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:
8d982c4 Updated Upstream (Paper)
2c7bad9 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
88a2c88 Revert usage of region manager
08581cf More validation
* Use faster block collision check for entity suffocation check
Improves the speed of checks by ~3,000ns per entity on average.
* Add alternative constructor for suffocation check
This fixes entities falling through non-full blocks, such as slabs or hoppers.
* add patches.md
Co-authored-by: Mykyta Komarn <nkomarn@hotmail.com>
Fixes an issue with limits being ignored with per player spawning
Fixes an issue where you would be respawned south no matter the rotation of your spawn point.
Additionally, removed Producer#fillList(Producer, List) from the collisions patch and moved it
where it is first used. That's a misc maintainability change, but we have to be consistent!
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:
fb292c1 Updated Upstream (Paper)
Purpur Changes:
bb5c8a7 Updated Upstream (Paper)
0c230d7 Updated Upstream (Tuinity)
Rainforest Changes:
cebeea1 Updated Upstream (Paper)
there was a mistake, looks like got unnoticed between ns and ms, but if any1 wants to get the value with seconds or even minutes then it wont rly work out.
* add perlin noise mixin
most likely broke because I didn't include something but we will see broke
* work
* more work
* working now
* update patches.md
* Cut Noise gen almost in half in most cases
* minor licence fix
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:
4a99f3e Updated Upstream (Paper)
f5d537e Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
7936e2b Make async usage of IteratorSafeOrderedReferenceSet less dangerous
Purpur Changes:
2cce22a Updated Upstream (Paper & Tuinity)
8d407a9 Despawn rate for llama spit
Previously the whitelist command was adding players 1 by 1. This caused massive overload
when you were adding multiple players due to the fact it saves every time a player was
added.
These changes aim to reduce that load whenever you are using the /whitelist command.
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:
be68938 Hey git, may I know what happened here?
1cac0a2 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
1e695f4 Make sure inlined getChunkAt has inlined logic for loaded chunks
cd22b8a Updated Upstream (Paper)
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:
76777f0 Updated Upstream (Paper)
6465aba Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.3
ba4dbb6 Do not allow ticket level changes while unloading playerchunks
e0e7144 Aggressive state checking in region manager
Purpur Changes:
0743d38 PaperPR - Add hex color code support for console logging
081f5a7 Oopsie, lets fix these snowballs :3
4895a88 Improve output of plugins command
3424c40 Minor changes to projectile despawn rate patch
9d49a31 Updated Upstream (Paper)
09e0103 add snowball to despawn rate config
Rainforest Changes:
5a187d6 Update to 1.16.3.
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:
d39cda0 Updated Upstream (Paper)
Origami Changes:
6c89f23 Update Paper
Purpur Changes:
242deee Merge pull request #63 from jmanpenilla/patch-1
700b42f Update README.md
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:
c9cfdba Updated Upstream (Paper)
Purpur Changes:
d4301d4 Updated Upstream (Paper)
0e1cb93 wandering trader spawn rate config
67a42f6 Despawn rate config options per projectile type
7a1012e Drop "Use-arrow-despawn-rate-for-all-projectiles.patch"
8767574 Fix#56Fix#50 - Ridable baby and tameable settings
8ec6f6f Fix#46 - Essentials EC overriding Purpur
a919aa3 Updated Upstream (Paper & Tuinity)
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:
5994cb0 Updated Upstream (Paper)
7dfe18c Merge https://github.com/Spottedleaf/Tuinity into ver/1.16.3
ef4e59a Optimise tab complete
Purpur Changes:
8726ad9 Updated Upstream (Paper)
Fixes#152
There is still the issue with doors which I will try to fix later on, but the new option should make them more "vanilla".
See the description of the new patch for more information.
See issue #176
This fixes the "it gets more serious". However, the problem is still being present.
it looks like it is purely random which hopper is going to suck in the item.
whatever weirdness is still present with hoppers and sorting systems, if its not mojang
then its paper's optimizations, which we're not removing.
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:
1c05858 Updated Upstream (Paper)
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:
483289c Updated Upstream (Paper)
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:
e36359e Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2
0b86de3 Fix several issues with Regions not recalculating correctly
36b43ee Automatically defrag IteratorSafeOrderedReferenceSet on element remove
Purpur Changes:
36672d6 remove unnecessary copying of BlockPosition
88ae09d fix the raid cooldown so that players can't just loop through the farm until the cooldown is over
de30a3e Updated Upstream (Paper & Tuinity)
Added codemc stuff
Added ProxyForwardDataEvent
Changed version fetcher cache time to 72000 ms
Improved fix of tuinity's portal crash. Should help with #190
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:
e59b60b Updated Upstream (Paper)
09f62a7 Rebuild patches
b041d11 Merge branch 'master' of https://github.com/Spottedleaf/Tuinity into ver/1.16.2
4468be2 Updated Upstream (Paper)
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:
a218f5d Updated Upstream (Paper)
We went thru a bunch of effort for this fix, but its finally been patched.
In the meantime I ported jellysquid's latest changes to entity collisions which also work completely fine.
Thanks to Simon ( @smonnnn ) who is also going to be the co-author of this commit cuz he was the one to properly implement the problematic patch .
These changes should lower your mspt.
Fixes#165Fixes#178
Co-authored-by: Simon L <slooij1@gmail.com>
Dropped hopper optimizations patch by tr7zw. Sorry buddy, but the patch was making more
problems than it was solving. By no means this is an unneded patch, we will reimplement
it in the future the way it should've been implemented. Fixes#148
