EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity
2,380 Commits 232 Branches 71 Tags 87 MiB
c3e2421d51
Commit Graph

278 Commits

Author SHA1 Message Date
MattBDev
93deebf4ca 1.10 fixes 2016-06-10 13:31:28 -04:00
MattBDev
482f4d6815 Modify Setting and Storage class names. 2016-06-10 13:00:34 -04:00
Jesse Boyd
f1f6b2781e Fix INSTABREAK flag 2016-06-06 06:34:05 +10:00
Jesse Boyd
237a0d8b6b Always cache * uuid 2016-06-05 20:11:02 +10:00
Jesse Boyd
960ad50070 Use DBFunc instead of dbManager 2016-06-05 19:54:33 +10:00
Jesse Boyd
951a6b82a2 simplify config / multiple expiry tasks / block cache fix 2016-06-05 17:28:43 +10:00
MattBDev
70aaa984e2 Documentation and Flag Changes. 2016-06-04 17:19:37 -04:00
Jesse Boyd
ca5d3a818b PlotBlock cache / events / flags 2016-06-04 06:20:13 +10:00
Jesse Boyd
f84766074e Fixes #1145 2016-06-04 03:36:39 +10:00
MattBDev
b4707c94c4 Fix #579 
Also tweaks to deprecation for development purposes.
 2016-06-03 10:57:25 -04:00
MattBDev
cee970e3d9 Tweaked some things 2016-06-02 13:42:32 -04:00
MattBDev
da58c7b411 Beautify code 2016-06-02 11:38:47 -04:00
MattBDev
89c4ce24ef Merge branch 'fix/forcefieldflag' of https://github.com/manuelgu/PlotSquared into manuelgu-fix/forcefieldflag 2016-06-02 09:52:30 -04:00
MattBDev
e6433a24ab Fix grow flags 2016-06-02 00:33:50 -04:00
MattBDev
f21d159911 Various fixes and tweaks. 2016-06-01 16:50:35 -04:00
MattBDev
042d8950ee Fix #1139 2016-05-29 20:48:14 -04:00
manuelgu
8d6565c32c Fix NPE 2016-05-29 19:38:31 +02:00
manuelgu
def33bc9ad Fix IntellectualSites/PlotSquared#1140 2016-05-29 11:59:16 +02:00
MattBDev
53e4b728a6 Merge remote-tracking branch 'origin/master' 2016-05-28 22:38:10 -04:00
MattBDev
4af846967c Fix #958 2016-05-28 22:37:56 -04:00
manuelgu
9ae4f02205 Fix forcefield flag 2016-05-28 01:16:01 +02:00
Jesse Boyd
85055320c2 Merge pull request #1134 from manuelgu/feature/componentevent 
[WIP] Implement PlotComponentSetEvent
 2016-05-28 09:13:04 +10:00
MattBDev
cc2d99849b Optimizations and javadoc tweaks 2016-05-26 09:19:38 -04:00
manuelgu
ceb8fb9fa3 Implement PlotComponentSetEvent 2016-05-25 21:49:55 +02:00
MattBDev
465f7f4504 Tweaks and doc updates. 2016-05-24 22:08:45 -04:00
Jesse Boyd
a2a43816ad *And this 2016-05-23 04:41:25 +10:00
Jesse Boyd
7bdcde6d24 Why was this made private? 2016-05-23 04:12:11 +10:00
Jesse Boyd
b8afbe8a00 Optimize auto trim + command cost/confirmation 2016-05-22 05:29:27 +10:00
MattBDev
13b7a798e6 ignored exception 2016-05-21 11:54:00 -04:00
MattBDev
8af30667e4 ignored exception 2016-05-21 11:18:35 -04:00
MattBDev
4bd83ab298 Logger changes 2016-05-21 11:16:21 -04:00
Jesse Boyd
7ae5042c32 Recover from bad data file 
Closes #1122
 2016-05-22 01:16:04 +10:00
Jesse Boyd
4ceb54b566 Add logger 2016-05-22 00:47:14 +10:00
MattBDev
b51d659ff9 Merge remote-tracking branch 'origin/master' 2016-05-20 20:29:32 -04:00
MattBDev
1768943360 Register flags 2016-05-20 20:29:16 -04:00
Jesse Boyd
6b1298a5e6 *Fix version check 2016-05-20 05:10:46 +10:00
Jesse Boyd
7873bcf592 Fixes #1102 2016-05-19 18:28:06 +10:00
manuelgu
18e3a7553e Fix #1085 
Fix #1085
 2016-05-15 22:05:52 -04:00
Jesse Boyd
c70c2283a2 Recover from failed event registration 2016-05-14 23:50:43 +10:00
manuelgu
2c0743b7e9 Proper method name 2016-05-13 19:04:55 +02:00
Jesse Boyd
00340d5154 Important fix 2016-05-14 01:13:08 +10:00
MattBDev
d47eeff23b Cleaning and Fix #1108 2016-05-12 18:00:38 -04:00
MattBDev
0958b57e46 Tidy code. 2016-05-12 17:09:35 -04:00
MattBDev
7947c3fdd7 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-05-12 15:43:44 -04:00
Jesse Boyd
dee8072d83 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 
# Conflicts:

#	Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java

#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
 2016-05-13 03:04:43 +10:00
Jesse Boyd
63c7041a34 Flag tweaks 2016-05-13 02:55:57 +10:00
MattBDev
63472ebeaf Merge branch '3.3.4' 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java
 2016-05-11 16:45:17 -04:00
MattBDev
d5cf81be5c 1.9.4 compatibility. 2016-05-11 12:11:46 -04:00
MattBDev
1db3d1aa72 Start 3.3.4 work to support 1.9.4 2016-05-11 11:16:38 -04:00
MattBDev
a4647b05e2 Fix #1011 2016-05-10 14:24:02 -04:00
MattBDev
421203a27d Bug Fix and Cleanup 2016-04-29 18:14:12 -04:00
MattBDev
8f3d35bca3 Bug Fix and Cleanup 2016-04-28 16:38:51 -04:00
MattBDev
669359cd37 General changes 2016-04-26 10:14:22 -04:00
Jesse Boyd
d8849f718c Fix plotworld get 2016-04-26 09:32:16 +10:00
MattBDev
74ed10c376 Completed and ready to test 2016-04-22 23:46:16 -04:00
MattBDev
aaf9511673 Start implementing new Flag system. 2016-04-22 23:46:16 -04:00
Jesse Boyd
d3dd88eb8d Fixes #1062 2016-04-22 23:45:19 -04:00
Jesse Boyd
10bf03f81b Disable colored chat 2016-04-22 23:45:19 -04:00
Jesse Boyd
40e063e702 Fixes #1050 2016-04-22 23:45:19 -04:00
MattBDev
c2c20ff189 Merge remote-tracking branch 'remotes/origin/master' 2016-04-11 17:04:52 -04:00
Jesse Boyd
9ba3b06854 change priority to low 2016-04-07 20:05:02 +10:00
Jesse Boyd
45b6950111 Fixes chat error / plot deny * 2016-04-07 03:33:49 +10:00
Jesse Boyd
8b10b7109c Merge remote-tracking branch 'origin/master' 
# Conflicts:

#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_8_3.java

#	Bukkit/src/main/java/com/plotsquared/bukkit/util/block/FastQueue_1_9.java
 2016-04-07 02:33:23 +10:00
Jesse Boyd
f7810860da Re-add WorldEdit check 2016-04-07 02:14:50 +10:00
MattBDev
4dcac29028 Weaken Declaration 2016-04-06 00:17:30 -04:00
MattBDev
d49de5297b Tweaks 2016-04-05 23:50:04 -04:00
MattBDev
9c81dfa5c3 Cleanup and Optimizations 
Abstracted TitleManagers
Removed a lot of Statics.
ETC.
 2016-04-05 12:53:40 -04:00
Jesse Boyd
fab60a0d53 Fix schematic on claim/auto 2016-04-05 11:07:37 +10:00
Jesse Boyd
1f32707ec2 Fix populate offset for older versions 2016-04-05 10:08:10 +10:00
MattBDev
95c9fd01dd Merged 2016-04-04 12:49:11 -04:00
manuelgu
6ab3a029b2 Add teleport on death feature 2016-04-04 11:31:15 +02:00
manuelgu
c69c4dd2e1 It actually is tested 2016-04-04 00:11:32 +02:00
manuelgu
4da38a6f9c Add bypass permission to breaking blocks at y0 2016-04-04 00:09:46 +02:00
Jesse Boyd
dffa00858d More than 2 lines 2016-04-02 17:15:36 +11:00
MattBDev
4ebd778c62 Optimizations and a purge fix 2016-04-02 01:30:26 -04:00
MattBDev
8243e0118a Optionals introduced, code cleaned, potential purge fix 2016-04-01 19:14:46 -04:00
Jesse Boyd
4a7112a0a5 Various 
Add some 1.9 blocks to chest content with schematic paste
Restructure tileentity placement from schematic (will soon add signs
etc)
Prepare for release 3.3.3
 2016-04-01 04:23:26 +11:00
Jesse Boyd
edd18a7178 Various 
- Fix some block change issues (for some reason sending a chunk would
sometimes reset any recent changes)
- Send chunk changes for relight command
- Have kick cmd kick the player from the server if they are kicked from
the spawn plot
- Plot size checks for downloading
- Fix some potential integer overflow issues for large plots (>64K x
64K)
- Fix some edge cases for plot move/copy
 2016-03-31 20:49:00 +11:00
Jesse Boyd
95d03e878c Cancel potion throw 2016-03-30 13:41:13 +11:00
Jesse Boyd
dca2696782 Forgot wall height 2016-03-30 13:26:23 +11:00
Jesse Boyd
1e93398fd8 Cancel lingering potion splash 
Cancelling the event still doesn't stop the animation.
 2016-03-30 13:23:31 +11:00
Jesse Boyd
1f6ad47a79 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Bukkit/src/main/java/com/intellectualcrafters/plot/api/PlotAPI.java
 2016-03-30 12:12:19 +11:00
Jesse Boyd
312ad4c48c fix index 2016-03-30 12:09:55 +11:00
MattBDev
31d346a587 Minor code cleanup 
Plus an optimization
 2016-03-29 17:00:07 -04:00
MattBDev
6007f040cd OCD 2016-03-29 15:47:59 -04:00
MattBDev
d0622eb87d PlotAPI doc and code cleaning 2016-03-29 14:35:40 -04:00
Jesse Boyd
6ebfd426c3 Just "height" would have made more sense 2016-03-30 05:14:51 +11:00
Jesse Boyd
560ebf412b Relight command 2016-03-30 04:34:48 +11:00
Jesse Boyd
df630f9be1 Remove outdated copyright notice at the top of each file 
- No license is the same as all rights reserved
- There's already a license at the root of the project
- The message was not in most files. easier to remove it
- Support link isn't valid
- No longer just the bukkit API
 2016-03-30 02:50:13 +11:00
Jesse Boyd
d9c6d04b46 Debug PlotMe conversion (temporary) 2016-03-29 19:13:48 +11:00
Jesse Boyd
6f9af04274 Cleanup BukkitChunkManager 2016-03-29 18:44:04 +11:00
Very Evil Olaf
30043fd1c1 Missing brackets 
very (VERY!) minor change ^^
 2016-03-29 09:10:24 +02:00
Jesse Boyd
eed8cbec5a Fixes #1015 2016-03-29 17:39:29 +11:00
MattBDev
32ba55baf5 Code cleanup and Optimizations 2016-03-29 00:56:44 -04:00
MattBDev
49d18b9229 Code cleanup 2016-03-28 23:26:44 -04:00
MattBDev
a8fd6d00d0 Sorry for the versioning confusion 2016-03-28 23:23:56 -04:00
MattBDev
b1fa258688 Code cleanup 2016-03-28 19:30:55 -04:00
MattBDev
76e2b1f416 Code cleanup 
maybe a bug fix or two
 2016-03-28 17:31:40 -04:00
MattBDev
8d4f042abc Cleanup of code 2016-03-28 13:28:21 -04:00
Jesse Boyd
dcd1a50a0c default tab completion + plot chat for merged plots 2016-03-28 22:52:29 +11:00
Jesse Boyd
ff1b7c66b1 What's snow-melt doing there? 2016-03-27 19:38:15 +11:00
Jesse Boyd
1bf05df706 Try this coolty 2016-03-27 16:01:53 +11:00
Jesse Boyd
e3f5842299 Recover from invalid db entry 2016-03-27 07:31:35 +11:00
Jesse Boyd
46d3dc609e Update sponge port 2016-03-27 06:47:34 +11:00
Jesse Boyd
1252e004a0 Cancel chat event 2016-03-25 15:56:11 +11:00
Jesse Boyd
2816ceae72 Change chat priority 2016-03-25 15:07:35 +11:00
Jesse Boyd
f74e7bb4cb Fixes #997 for 1.8 2016-03-25 14:50:57 +11:00
Jesse Boyd
30d57d8642 Fixes #997 for 1.9 (TODO fix for 1.8 as well) 2016-03-25 14:25:06 +11:00
Jesse Boyd
8a42eecc11 Command changes 
Legacy commands still need to be cleaned up (after which economy /
confirmation can be centralized)
All command names / usage / description is configurable
Simplifies creating commands
Deeper tab completion / command help
 2016-03-24 20:57:59 +11:00
MattBDev
a62b9a334d Cleaning 2016-03-24 00:50:25 -04:00
MattBDev
bb4700aa5a More cleaning 2016-03-23 13:09:13 -04:00
MattBDev
9e2c6f2182 Major code reformatting 2016-03-22 21:41:39 -04:00
manuelgu
84188f6557 Cleanup 2016-03-22 18:53:17 +01:00
Matt
09ee7f3048 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Area.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Auto.java
#	Core/src/main/java/com/intellectualcrafters/plot/database/SQLManager.java
#	Core/src/main/java/com/intellectualcrafters/plot/generator/HybridUtils.java
#	Core/src/main/java/com/intellectualcrafters/plot/object/Plot.java
#	Core/src/main/java/com/intellectualcrafters/plot/object/PlotAnalysis.java
 2016-03-20 23:03:31 -04:00
Matt
029241912b Code Style Cleanup 2016-03-20 22:52:16 -04:00
MattBDev
cb0b59fdb4 Merge branch 'feature/rm-redundant-methods' of https://github.com/manuelgu/PlotSquared into manuelgu-feature/rm-redundant-methods 2016-03-20 19:52:11 -04:00
MattBDev
bb4ecb94a1 Cleanup 2016-03-20 19:35:40 -04:00
manuelgu
df12e53d40 Remove redundant .s() methods 2016-03-20 23:19:37 +01:00
zomb
712ce74af6 /p weanywhere change 
Allows players with "WorldEdit Anywhere" toggled to use the wand
anywhere
 2016-03-20 00:26:45 -10:00
Matt
19b6df8268 Cleanup 2016-03-19 14:07:55 -04:00
Jesse Boyd
8074d041b8 Fix "Cleaner reflection" breaking plugin. 
Also add method to sort plots by modification date.
 2016-03-19 17:32:05 +11:00
Matt
d30626d11f Cleaner reflection 2016-03-19 00:39:42 -04:00
Jesse Boyd
f26278f72e Fixes #950 2016-03-19 13:01:10 +11:00
Jesse Boyd
9e32ce9885 Automatically drop unique_alias for MySQL 2016-03-18 03:05:36 +11:00
Jesse Boyd
f9db269813 Various 
Close #966
Close #953
(duplicates)
Changes to chunk copying etc to interfere less with world generation
 2016-03-18 01:22:51 +11:00
Jesse Boyd
16dac99fed Any reason for breaking it in the last commit? 2016-03-17 20:33:47 +11:00
Jesse Boyd
98c4483535 Various 
some sponge stuff
schematic/mca/bo3 uploading rework
fix minor issue with plot visit
fix #956
 2016-03-17 20:11:07 +11:00
Matt
75bf01c13f Fixed casting issue in FastQueue_1_9 2016-03-16 19:18:09 -04:00
Matt
7bbd359be8 Fixed #957 2016-03-16 18:50:55 -04:00
Matt
58eeeb16d4 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2016-03-16 10:16:19 -04:00
Matt
65ddb12701 Beginning rewrite of Flags and various cleanups 2016-03-16 10:15:38 -04:00
zomb
a297d505f8 Pulled files from official repository 2016-03-15 22:15:47 -10:00
zomb
a26db46242 Pyromania 
Adds block-ignition, which allows fire being set by players,
dispensers, explosions, and fireballs (if their origin is the same as
the plot that they land in)

Adds fire-spread, which allows fire to spread from lava and fire
spreading in general

Adds block-burn, which allows blocks to burn away
 2016-03-15 21:59:01 -10:00
Matt
bb8883dfaf Added snow-melt flag 2016-03-14 11:01:52 -04:00
Matt
bee6f83e79 Various changes 2016-03-14 02:18:04 -04:00
Matt
ae885eafca Various changes and Merge Economy Fix 2016-03-13 22:44:59 -04:00
Jesse Boyd
8739f3ef78 Horses aren't hostile. 2016-03-14 12:34:58 +11:00
Matt
dfd29f6713 Various changes 
Plot class is now more reliable as most fields are private
Cleanup some classes.
Fixes #955
makes progress on #953
 2016-03-13 14:09:48 -04:00
Jesse Boyd
3fb686608b Merge pull request #951 from Gabscap/fix-static 
Make WorldEvents method non-static
 2016-03-13 04:00:40 +11:00
Jesse Boyd
a8fd1b49ca Various 
sponge changes / documentation / cleanup / event tweak
 2016-03-13 03:57:36 +11:00
Gabscap
4c40268e8f Make WorldEvents method non-static 2016-03-12 16:27:03 +01:00
Jesse Boyd
66da71bc9f Various 
Fixes a few typos
Fixes #943
Fixes #944
Fixes metrics (broke in b69e31129d)
Fixes plot setup issue
Fixes some lighting issues
Fixes ChunkListener + cauldron
Tweak some  schematic stuff
 2016-03-11 15:33:39 +11:00
Matt
c979be2994 Add missing permission to plugin.yml file 2016-03-10 17:12:56 -05:00
Jesse Boyd
fef2bc0cf2 Restore metrics 2016-03-08 16:31:40 +11:00
Matt
d2c81cbd01 Use Metrics Dependency 2016-03-07 14:56:06 -05:00
Jesse Boyd
b59665b00b Fix #938 2016-03-07 19:37:53 +11:00
Jesse Boyd
62531a42c7 Fix for @Htgan / clear 
Possibly fixes #932
 2016-03-07 17:34:57 +11:00
Jesse Boyd
b95fdeccca Maybe? 2016-03-06 19:08:01 +11:00
Matt
32d4a08db1 Small cleanup 2016-03-04 19:53:31 -05:00
Matt
5c60d69fd1 closes #915 2016-03-04 16:37:38 -05:00