Rick
a65fe55a43
altarinuse addition
2018-05-03 14:41:11 -04:00
VoidAngel
b3b2ec5978
Fixes a bug where mobs could pick up altar probe items
2018-04-30 18:00:37 -07:00
VoidAngel
f8112ccb37
Prevent SF items from being used in brewing stands
2018-04-30 17:58:04 -07:00
VoidAngel
9d1ad3c866
Removed redundant code
2018-04-29 11:15:07 -07:00
VoidAngel
e0fd8a358e
Fixed the protection check location
2018-04-29 10:37:11 -07:00
VoidAngel
f9ab6492ee
Merge remote-tracking branch 'upstream/master'
2018-04-29 10:27:40 -07:00
VoidAngel
fc601bda6b
Updated saw mill block check
...
The saw mill will now only use the CS-CoreLib protection manager. Also Ive added a check to prevent people from duping planks using barrels.
2018-04-29 10:27:30 -07:00
KyleEstein
17ec56799a
Allow admins to chose ore washer and dust washer behavior
2018-04-28 20:13:37 -04:00
KyleEstein
692904ffc3
Missed updating one onBreak() in AFarm.java
2018-04-28 12:14:17 -04:00
KyleEstein
a876301d94
Cast inventory to a variable instead of calling getInventory() over and over
2018-04-28 12:05:43 -04:00
KyleEstein
b16b936b81
Fix Additional Devices Vulnerable to Duplication Bug
2018-04-25 23:40:46 -04:00
KyleEstein
66176b445a
Merge branch 'master' of github.com:KyleEstein/Slimefun4
2018-04-25 19:36:37 -04:00
TheBusyBiscuit
dbdfa3cdb7
Merge pull request #662 from Redemption198/master
...
Added CS-CoreLib permission check for Slimefun Machines
2018-04-26 00:04:15 +02:00
VoidAngel
5f8328c02c
Removed unintended code
2018-04-25 10:45:54 -07:00
VoidAngel
2506437339
Revert "Fix for players getting stuck in elevator books/teleporter guis"
...
This reverts commit f595cb06a8
2018-04-25 08:52:31 -07:00
Redemption
3a0d73ae9c
Added CS-CoreLib permission check for Slimefun Machines
...
Removed the horrible whitespaces and updated the code to the last commit.
2018-04-25 11:18:49 +02:00
TheBusyBiscuit
827bc3c370
Merge branch 'master' into master
2018-04-25 10:13:47 +02:00
VoidAngel
6482f317b2
Merge remote-tracking branch 'upstream/master'
2018-04-24 21:31:19 -07:00
VoidAngel
f91c319c49
Fixes SF Guide dupe glitch and accidental item loss bug
...
This patch makes the menu slots unclickable in all Guide menus.
2018-04-24 21:30:41 -07:00
VoidAngel
846d0b41d3
Revert "Slimefun book GUI dupe fix"
...
This reverts commit 19f4666235
2018-04-24 20:43:24 -07:00
Rick
4acd3645dd
Reverts change to isItem, makes changes instead to getByItem
2018-04-23 20:34:53 -04:00
Redemption
0e7597e06f
Added CS-CoreLib permission check for Slimefun Machines
...
Added CS-CoreLib permission check for Slimefun Machines.
Updated some deprecated methods.
2018-04-23 22:33:08 +02:00
Kyle Einstein
e2342c38eb
Fix Two Player Duplication Bug
2018-04-23 08:33:29 -04:00
Rick
1f88557e4c
Removing all changes.
2018-04-22 12:48:19 -04:00
Rick
444cb1538e
Removing all changes.
2018-04-22 12:48:00 -04:00
Rick
91587048c3
removes case for getbyitem... since i can't check items in the loop here, I can't check the actual item, so this just throws an error and doesn't work anyway.
2018-04-22 12:47:22 -04:00
Rick
47d95af0a0
Fix whitespace issue.
2018-04-22 12:12:52 -04:00
Rick
e6199e3d46
Moves special case out of loop
2018-04-22 12:11:51 -04:00
Rick
3b5669dbaf
Fixing some character issue from prior pull requests.
2018-04-22 12:00:23 -04:00
Rick
8e3d2e332b
redoing this to fix a thing.
2018-04-22 11:59:53 -04:00
Rick
c65d8cf49b
Redoing this to fix a thing.
2018-04-22 11:59:36 -04:00
Rick
2b9e24b45b
Commit 1 of 2 for ticket #643 -- eliminates Altar dupe bug by disallowing all interactions while altar is in use.
2018-04-22 10:58:57 -04:00
Rick
34150791bc
Commit 2 of 2 for ticket #643 -- eliminates Altar dupe bug by disallowing all interactions while altar is in use.
2018-04-22 10:58:36 -04: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
83e55c255d
Changed to special cases only for solving issue with Broken/Repaired spawner renaming ability. There may still be other items these routines don't define as "SlimeFun items" without identical lore to the example, but hopefully this covers everything.
2018-04-22 10:19:57 -04:00
Rick
fd9ed5155a
cleaned up some whitespace that showed up in last commit.
2018-04-21 17:28:43 -04:00
Rick
201fb33eb4
Closes #631... player no longer needs to be "owner" of the item to break these two blocks. This makes sense to me since most Slimefun blocks do not check for this either except maybe those which have inventories, which neither of these do.
2018-04-21 17:20:43 -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
Rick
44e9a3cc43
Copies entirety of logic from the Enhanced Crafting table to the Magic Workbench for the crafting of Soulbound Backpacks. On further investigation, I discovered this did not "delete" the ID of the backpack being used for crafting, but instead recycles that ID for use in the final crafted pack and simply adjusts the size for that ID so that it matches. By taking that approach, I was forced to include all of this even though this will make it exponentially more difficult to make ID-less packs for sale in other plugins like ChestShop.
2018-04-20 17:47:41 -04:00
Rick
6e1376cfb2
Fix for the Anvil being able to rename Broken and Reinforced Spawners resulting in becoming vanilla pig spawners. Problem with isDisabled... called isItem... which doesn't return an affirmative unless the lore matches exactly... however... lore would nearly never match exactly: backpacks have different ids or no ids, no item ever matches to "<type>" or "<id>" which should result in a great number of slimefun items being identified as NOT SlimeFun items.
2018-04-20 17:43:57 -04:00
VoidAngel
f595cb06a8
Fix for players getting stuck in elevator books/teleporter guis
2018-04-19 14:11:23 -07:00
VoidAngel
19f4666235
Slimefun book GUI dupe fix
...
Adds a player to a List when they have the guide open and cancels all inventory clicks until the menu is closed.
2018-04-17 23:35:33 -07:00
SoSeDiK
c8ab30a485
Removed changes
...
Move RecipeType to the ExoticGarden
2018-04-17 00:47:05 +03:00
SoSeDiK
3edba533c9
Added a new Category for ExoticGarden
2018-04-16 23:39:06 +03:00
SoSeDiK
b423c9bd87
Replaced deprecated method
2018-04-16 19:46:18 +03:00
SoSeDiK
111424bae4
Replaced deprecated method
2018-04-16 19:45:09 +03:00
SoSeDiK
eb7388c613
Replaced deprecated method
2018-04-16 19:43:03 +03:00
SoSeDiK
2f7d4b619b
Replaced deprecated method
2018-04-16 19:41:50 +03:00
SoSeDiK
41b6cd389d
Added holidays prefixes
2018-04-16 19:11:50 +03:00
SoSeDiK
44e696c19c
Added holidays prefixes
2018-04-15 19:55:18 +03:00
SoSeDiK
5a3978691f
Added holidays prefixes
2018-04-15 19:53:11 +03:00
SoSeDiK
1482218f84
Added holidays prefixes
2018-04-15 19:29:03 +03:00
SoSeDiK
86429da311
Oops... Forgot about the import.
2018-04-15 19:23:23 +03:00
SoSeDiK
eabd074f05
Fixed & in title messages
2018-04-15 19:18:43 +03:00
SoSeDiK
42ae9103e5
Replace deprecated method
2018-04-10 02:12:25 +03:00
SoSeDiK
9f2d91a20c
Allow using different log types
2018-04-10 02:04:43 +03:00
SoSeDiK
f328300941
Food Fix For Creative Mode
2018-04-10 01:57:35 +03:00
SoSeDiK
9b64804461
Update SlimefunSetup.java
2018-04-10 01:53:16 +03:00
SoSeDiK
5267cdb82b
Fixed mistake
2018-04-10 01:52:24 +03:00
SoSeDiK
410a901bfd
Fixed mistake
2018-04-10 01:51:06 +03: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
f30c61fcfc
Check if the chunk is loaded instead of relying on exceptions
2018-03-10 19:08:18 +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
Oliver Wright
5aef1c1a25
Prevent Talisman of the Hunter from duping armour/heads
2018-03-05 19:15:38 +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
TheBusyBiscuit
ef51932e31
Merge pull request #619 from meiamsome/electric-dust-washer
...
Fix #617 : Electric Dust Washer - Dust Choice.
2018-03-02 22:51:36 +01:00
TheBusyBiscuit
25539be913
Merge pull request #620 from meiamsome/error-file-creation-fix
...
Simplify error file name generation
2018-03-02 22:45:10 +01:00
Oliver Wright
7278f80c6f
Fix #617 : Electric Dust Washer - Dust Choice.
2018-03-02 20:17:44 +00:00
Oliver Wright
273499a230
Simplify error file name generation
2018-03-02 20:03:11 +00:00
Oliver Wright
63e5245b2c
Simplify the RitualAnimation
2018-03-02 19:40:45 +00:00
VoidAngel
1e5d7e0d2d
Fix discrepancies between block storage data and server events
...
1) Stop falling blocks from falling into a spot where an SF machine was just mined. Typically the blockstorage does not update fast enough, causing machine duplication. The event is cancelled, and the falling entities drop as items instead of disappearing.
2) Nearly the same as above, but with pistons pushing solid blocks into air blocks which had a slimefun machine in it a moment prior. Typically the blockstorage does not update fast enough, causing machine duplication.
2018-02-21 09:50:59 -08:00
TheBusyBiscuit
c33c8e065e
Merge pull request #597 from Meta-Win/master
...
Fix #575
2018-02-20 23:47:06 +01:00
VoidAngel
2bec58d361
Fix for #532 - Limited disenchanter dupe glitch
2018-02-20 14:14:56 -08:00
Meta-Win
948c6a650b
Fix Conflict Names
2018-02-15 14:25:55 -02:00
Meta-Win
79cd64361a
Fix Conflict Names
2018-02-15 14:25:14 -02:00
Meta-Win
e7e195a43e
Fix Conflict Names
2018-02-15 14:24:27 -02:00
Dylan Xaldin
16899eb96a
Fix Reinforced Spawners being a Pig Spawner when placed.
2018-02-07 19:06:06 -06:00
TheBusyBiscuit
7fefb0ea15
Merge pull request #573 from AtomicScience/master
...
Fixed Cooler rejecting Juices
2018-01-10 12:30:58 +01:00
AtomicScience
5c688177f8
Some tiny changes in onClick()
2018-01-08 22:33:47 +03:00
TheBusyBiscuit
0a6f54ec8d
Merge pull request #569 from Poslovitch/documentation
...
Documentation fixes and improvements
2018-01-07 20:48:12 +01:00
TheBusyBiscuit
1d0660db53
Merge pull request #570 from Redemption198/master
...
Fixed Android Miner not breaking Slimefun blocks correctly
2018-01-07 20:29:14 +01:00
AtomicScience
44e8b103f9
Fixed Cooler rejecting juices
2018-01-07 17:33:57 +03:00
Redemption
24e070b7a8
Moved BlockStorage.check() inside the methods
2018-01-07 12:52:28 +01:00
Redemption
7b9687f79d
Added blockhandler check before breaking sf blocks
2018-01-07 01:26:38 +01:00
Redemption
17cc989012
Documented #retrieve()
...
Credits: @Poslovitch
2018-01-06 16:13:16 +01:00
Redemption
9f0796327b
Fixed Android Miner not breaking Slimefun blocks correctly
2018-01-06 15:53:23 +01:00
Florian CUNY
16af68b289
Simplified CategorySorter#compare()
2018-01-06 15:28:02 +01:00
Florian CUNY
f2a74bb46c
Improved documentation in Category and Alloy
2018-01-06 15:26:01 +01:00
Florian CUNY
7851f33b57
Fixed @since tags for 4f0aeed504
2018-01-06 15:03:28 +01:00
TheBusyBiscuit
bb22ceab5b
Merge pull request #567 from John000708/master
...
Fixed speed modifier not getting applied to Enhanced Furnaces
2018-01-06 12:54:31 +01:00
TheBusyBiscuit
9a948b705a
Merge pull request #560 from Poslovitch/preparing-new-guide-layout
...
Preparing new guide layout
2018-01-06 12:53:07 +01:00
John000708
3e232c00d8
Tiny typo fixed
2018-01-06 12:51:16 +01:00
TheBusyBiscuit
4f9c36c8a2
Merge pull request #557 from StarWishsama/master
...
correct word in Files.java
2018-01-06 12:49:49 +01:00
John000708
2777ec9407
Small fix
2018-01-06 11:07:54 +01:00
John000708
b6c3021355
Fixed speed modifier not getting applied to Enhanced Furnaces
2018-01-05 18:09:10 +01:00
Redemption
fefd3b1fe5
Removed debug prints
2018-01-03 16:36:40 +01:00
