1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Commit Graph

110 Commits

Author SHA1 Message Date
TheBusyBiscuit
2812b84ea8 Minor Code Optimizations 2019-06-20 10:12:34 +02:00
TheBusyBiscuit
1fd0b40f9f Removed URID 2019-06-20 09:50:59 +02:00
CyberPatriot
877e01b1be
Fix for issue #879
This edit is for issue #879 . Tested on latest versions of Slimefun, ChestTerminal, and CS-CoreLib. 1.13 is to be determined.
2019-06-12 23:48:38 -05:00
TheBusyBiscuit
33073a4100
Merge pull request #877 from SoSeDiK/lambda
Use lambda expressions
2019-04-07 11:44:42 +02:00
Bas Verhoeven
0d45fee741 Do not overwrite block for a location that already has a valid block
This shouldn't happen, but if it does happen it'll definitely break the block.
We'll notify the server administrator on load and only keep the first block we
see.

Note that this will only happen if there's something seriously wrong with the
block as generally there'll not be a situation where information is stored in
two different files.
2019-04-07 03:02:09 +02:00
Bas Verhoeven
1d7c1e68c8 Do not load incomplete blocks (missing "id")
If incomplete blocks are loaded, without an "id", items will not have
any usable slimefun block information and will not be usable. Breaking
these blocks will give you a "CSCoreLib's Head".
2019-04-07 03:01:53 +02:00
SoSeDiK
385edf3cd7 Even more lambdas expressions 2019-03-31 21:32:40 +03:00
SoSeDiK
3c4e8e6b32 Use lambda expressions 2019-03-30 14:32:13 +02:00
SoSeDiK
4a4934de68 Prevent "Asynchronous entity add!" 2019-03-30 12:15:56 +02:00
SoSeDiK
76d00f9a34 Optimized error logging 2019-03-27 21:31:51 +02:00
SoSeDiK
ef868eae31 Removed unused imports 2019-02-23 23:14:01 +02:00
TheBusyBiscuit
02674e2463
Merge pull request #841 from PrzemoVi/master
Fixed particles, some bugs.
2019-02-20 12:55:47 +01:00
PrzemoVi
5c29f9c8d4
Merge branch 'master' into master 2019-02-08 18:05:48 +01:00
Steve
a91b6253aa
Import Color 2019-02-03 12:45:26 +03:00
Steve
c62c3246ff
Fix particles 2019-01-26 16:21:27 +03:00
BuildTools
d88eaf9674 Fixed network particles, pom.xml, some other bugs. 2019-01-17 00:27:39 +01:00
MisterErwin
c0e51f2458 Code cleanup + MaterialHelper 2018-09-05 18:26:58 +02:00
MisterErwin
81031d3acc Using spigot Particles and BlockData Directional 2018-09-05 17:51:38 +02:00
TheBusyBiscuit
b7385d1fc1
Merge pull request #751 from creator3/master
Hopefully reduce input node breakage
2018-08-06 21:17:46 +02:00
creator3
338621670b Hopefully reduce input node breakage 2018-07-31 15:55:18 -04:00
DrOreo002
9d3ca22b1f Some code cleanup and fix grappling hook dupe 2018-07-15 13:02:45 +07:00
creator3
ae3ba64f54 Parse block info at startup 2018-06-15 19:23:51 -04:00
SoSeDiK
3cf306ce34 Replaced deprecated methods 2018-06-06 12:41:56 +03:00
SoSeDiK
6eb17d1d45 Removed unused imports 2018-06-06 11:46:18 +03:00
Rick
fda8f56f8a Switched to "continue" as stated. Although... pondering as to why this would have seemed to have worked anyway... the way I did it, in the case of a match, the whole thing quits... which is actually fine if the user just died in a keep-inventory region. If there was a better way of determining the existence of a keep-inventory region from all plugins that might produce one, really, that's what we'd rather be checking for here anyway. This is a fine alternative, but actually identical items will result in only one being kept when dying in a non-keep-inventory situation. 2018-04-22 10:25:44 -04:00
Rick
785cbea08f I could not use "breaK" as advised as that would completely break the loop and cease checking for duplicates among the remaining items. However, we are only checking against 5 additional slots here, so I've stated them each and made them return if a match is a bit better than setting a variable and all that, this is also more clear about what is going on here. I will state that the previous patch does introduce a limitation: identical soulbound items would be lost. Having exactly duplicated soulbound items prior to a death is a rather extreme situation, but during my testing I actually was using some I duplicated in creative mode and noticed that I would only retrieve one of each, and not the copies. It might be desireable to integrate an option here to only use this logic IF keep inventory regions will be in use somewhere, although not entirely necessary. 2018-04-20 17:53:36 -04:00
TheBusyBiscuit
7b07bc8c61
Merge pull request #630 from meiamsome/network-caching
Create a Network class to manage networks in a stateful way
2018-03-25 10:19:07 +02:00
TheBusyBiscuit
3d90994d9f
Merge pull request #632 from meiamsome/fix-509
Check if the chunk is loaded instead of relying on exceptions
2018-03-25 10:11:50 +02:00
Oliver Wright
eaa93df83e
Move Block storage to be based on Locations. 2018-03-10 19:22:12 +00:00
Oliver Wright
d21f93239b
AReactor fix & a fix for chargable energy sources 2018-03-10 15:32:16 +00:00
Oliver Wright
2c0dc15e4c
Create a Network class to manage networks in a stateful way 2018-03-10 01:05:15 +00:00
TheBusyBiscuit
b3e5e45b2c
Merge pull request #623 from AtomicScience/master
Fixed incompatibility with KeepItems-like plugins
2018-03-03 17:42:43 +01:00
AtomicScience
fb07f1bb32
Fixed incompatibility with KeepInventory 2018-03-03 18:47:54 +03:00
Oliver Wright
273499a230
Simplify error file name generation 2018-03-02 20:03:11 +00:00
Redemption
17cc989012
Documented #retrieve()
Credits: @Poslovitch
2018-01-06 16:13:16 +01:00
TheBusyBiscuit
fb4b3ab738
Fixed Arguments 2017-12-29 12:10:21 +01:00
TheBusyBiscuit
f5d9170961
Fixed Import 2017-12-29 12:01:22 +01:00
TheBusyBiscuit
f9f4648303
Fixed ChestTerminal Lore 2017-12-29 11:54:23 +01:00
Florian CUNY
2d38231101 Small performance improvement in CargoManager
done by saving the blockinfo to avoid heavy calls. Would probably need later a more reliable "rewrite".

Fixes https://github.com/TheBusyBiscuit/Slimefun4/issues/514
2017-12-21 08:22:57 +01:00
Meta-Win
dbe900b39b
Add files via upload 2017-12-20 00:44:53 -02:00
Meta-Win
a257efa98f
Add files via upload 2017-12-20 00:44:22 -02:00
Meta-Win
aeaa912bf2
Add files via upload 2017-12-20 00:43:51 -02:00
Florian CUNY
475eaae0b0 Fixed typo "Slimfun" to "Slimefun" 2017-12-01 19:28:12 +01:00
TheBusyBiscuit
fe4ec68a35
Merge pull request #502 from Poslovitch/slimefunitem-improvements
SlimefunItem : renames of some methods, made ghost configurable, changed "name" to "id" and privatized all fields
2017-11-26 09:50:41 +01:00
Florian CUNY
fd4d678332
Use brackets in loops 2017-11-25 10:31:09 +01:00
Florian CUNY
93f877a2d4 Error reports : prioritized Slimefun Environment (addons, etc) 2017-11-25 10:22:53 +01:00
Poslovitch
502efd862b Revert requirePermissionToUse (not ready yet) 2017-11-22 20:37:30 +01:00
Florian CUNY
58b9bff978 Made the required permission a field 2017-10-13 21:12:33 +02:00
Florian CUNY
657fd4d112 Added requirePermissionToUse field (https://github.com/TheBusyBiscuit/Slimefun4/issues/410) 2017-10-13 20:46:28 +02:00
Florian CUNY
cc79e62f34 Made use of the renamed methods 2017-10-13 16:34:38 +02:00