TheBusyBiscuit
|
439818fb0e
|
Merge pull request #673 from KyleEstein/legacy_washers
Allow admins to chose ore washer and dust washer behavior
|
2018-05-05 19:38:29 +02:00 |
|
Rick
|
80e1a489c8
|
Fixes repaired/reinforced spawner in guide.
|
2018-05-05 09:20:10 -04:00 |
|
KyleEstein
|
07134165d6
|
Implement changes requested by TheBusyBiscuit
|
2018-05-04 21:41:24 -04:00 |
|
Rick
|
0d3fa24290
|
changing again to ampersands...
|
2018-05-04 14:44:09 -04:00 |
|
Rick
|
cc5e7c6e13
|
Stops constant calls to getByItem() for empty book stacks.
|
2018-05-03 23:21:14 -04:00 |
|
Rick
|
e3bbf4b442
|
Fixes Repaired Spawner in the guide... no idea why that's true.
|
2018-05-03 20:52:32 -04:00 |
|
Rick
|
41da2c4402
|
put e back from texture address... don't know why that vanished.
|
2018-05-03 18:50:23 -04:00 |
|
Rick
|
391e897911
|
Trying again to refix the UTF-8 characters (I guess they changed the file type too, changed it to UTF-8 to fix this from happening again)
|
2018-05-03 17:20:05 -04:00 |
|
Rick
|
e8f3c62e02
|
Removes non UTF-8 chars from Programmable Android (Miner) which broke it.
|
2018-05-03 14:48:25 -04:00 |
|
Rick
|
4cde9413ba
|
Adds checks for and adds to altarinuse.
|
2018-05-03 14:47:44 -04:00 |
|
Rick
|
5d830fca94
|
Removes altar and pedistals from altarinuse when finish()-ed. May fix dupe on break during craft (abort()).
|
2018-05-03 14:47:12 -04:00 |
|
Rick
|
d036d297c0
|
Adding alterinuse variable
|
2018-05-03 14:45:38 -04:00 |
|
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 |
|