Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-08 09:54:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,581 Commits 14 Branches 68 Tags 88 MiB
a83b51eb12
Commit Graph

144 Commits

Author SHA1 Message Date
Jesse Boyd
9a7ce84e1c
Potentially fixes #1769 2018-05-07 10:20:13 +10:00
Jesse Boyd
d22c0349f7
* 2018-01-25 15:32:25 +11:00
Jesse Boyd
785ba10ca1
Update to latest sponge 2018-01-25 14:51:39 +11:00
Jesse Boyd
0d608245f5
Some tweaks / optimizations 2017-09-25 16:57:42 +10:00
Jesse Boyd
2b1905889c
Minor sponge fix 2017-05-16 13:20:28 +10:00
Jesse Boyd
193948d4fd
Fix claim 2017-04-17 11:56:10 +10:00
Jesse Boyd
6e0ade4f63
Some sponge fixes 2017-04-07 08:25:08 +10:00
Jesse Boyd
022372e9b7
Fixes #1534 + various 
Auto world loading/unloading
Auto player teleporting on login
 2017-04-04 07:59:36 +10:00
Jesse Boyd
5d6f4c6668
Some plot area restructuring 2017-03-23 11:10:29 +11:00
Jesse Boyd
a07ed4eafd
* 2017-03-18 00:50:43 +11:00
Jesse Boyd
5262ff665a
Fix door break 2017-03-18 00:49:41 +11:00
Jesse Boyd
a628c5927f
Fixes #1560 2017-03-17 16:40:29 +11:00
Jesse Boyd
411c75b219
Fixes #1556 Close #1555 2017-03-14 01:56:14 +11:00
Jesse Boyd
491cc50440
Fixes #1528 2017-03-13 18:45:37 +11:00
Jesse Boyd
93717e670c
Use InteractBlockEvent 
For some reason sponge was calling the event twice, the second with a
relative location, which makes no sense. Switching to a different event
works.
 2017-03-13 17:34:44 +11:00
Jesse Boyd
38a33248e7
Send message on perm check 2017-03-13 09:04:40 +11:00
Jesse Boyd
52496af9a1
Fix road interact on sponge 2017-03-13 07:16:16 +11:00
Jesse Boyd
35ebc8c830
Permission check fix 2017-01-13 07:22:28 +11:00
MattBDev
11913bfbe5 Fix compile issue 2016-11-26 17:53:44 -05:00
MattBDev
62b353f82d Various Sponge changes 
- many improvements
- inventory utilities broke when updating to Sponge API 6.0.0
 2016-11-26 16:49:13 -05:00
MattBDev
5cbd2f44bd Update Sponge Gradle 2016-11-26 11:55:59 -05:00
Jesse Boyd
12f8861d07 Various 
externalize strings
plotme conversion fixes
 2016-09-26 18:31:08 +10:00
Jesse Boyd
d89274ce09 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
 2016-09-17 16:03:57 +10:00
Jesse Boyd
264114332b Let generator be up to the implementation 2016-09-17 16:02:05 +10:00
MattBDev
a4363bdb27 Fix #1355 
There is the possibility this will cause issues with sponge

Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-14 19:27:30 -04:00
Jesse Boyd
85ff8bf639 Minor tweaks 2016-09-07 00:28:01 +10:00
Jesse Boyd
d75ab130da Sponge fixes 2016-09-02 15:58:24 +10:00
MattBDev
27c21b9ab6 Fix #1321 2016-08-30 21:50:52 -04:00
Alex
37e4a652dd Now calling the respective events when a user is removed from a plot. 
And switched the event calling of adding Helpers and Trusted players. (Correct me if that was wrong)
 2016-08-08 22:45:08 +02:00
MattBDev
e801c6d7e8 Merge branch '3.4.5' 2016-07-31 00:16:37 -04:00
Jesse Boyd
409456e895 Minor sponge fix 2016-07-31 09:16:58 +10:00
MattBDev
e8f4eae6f7 Merge remote-tracking branch 'origin/3.4.5' into 3.4.5 
# Conflicts:
#	Sponge/build.gradle
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
 2016-07-29 21:45:34 -04:00
MattBDev
610e204d12 Fix #1281 , Fix #1282 , and Sponge gradle 2016-07-29 12:47:42 -04:00
MattBDev
1f341e6ba9 Merge remote-tracking branch 'origin/master' into 3.4.5 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
#	Sponge/src/main/java/com/plotsquared/sponge/generator/SpongeAugmentedGenerator.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeSetupUtils.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
#	build.gradle
 2016-07-29 12:25:11 -04:00
Jesse Boyd
ffddf5c187 Fix sponge generator cast 2016-07-29 12:12:28 +10:00
MattBDev
b5ec6232f9 Sponge Fixes and minor changes. 2016-07-25 22:25:15 -04:00
MattBDev
34c2da55ca Change Sponge method behavior 2016-07-25 22:25:15 -04:00
MattBDev
33ec80c2cb Fix Sponge generation casting 2016-07-25 22:25:15 -04:00
Jesse Boyd
d23d8c2fd8 *should use this cause instead 2016-07-25 22:25:15 -04:00
Jesse Boyd
3498f309e8 Minor sponge fixes 2016-07-25 22:24:31 -04:00
Jesse Boyd
0b5177f192 Minor uuid cache changes 2016-07-25 22:23:49 -04:00
MattBDev
b2fdcad317 Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared into 3.4.5 
# Conflicts:
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/block/GenChunk.java
 2016-07-25 22:08:54 -04:00
MattBDev
80ea3e9ce7 Sponge Fixes and minor changes. 2016-07-25 20:00:59 -04:00
MattBDev
5f8c77a6cd Change Sponge method behavior 2016-07-25 18:43:11 -04:00
MattBDev
290e5c68dc Fix Sponge generation casting 2016-07-25 18:42:31 -04:00
Jesse Boyd
30d18c917d *should use this cause instead 2016-07-25 09:54:35 +10:00
Jesse Boyd
b91eab2f0c Minor sponge fixes 2016-07-25 09:47:49 +10:00
Jesse Boyd
770b9be160 Minor uuid cache changes 2016-07-25 09:23:20 +10:00
MattBDev
2b9c2959cf Merge branch '3.4.5' of https://github.com/IntellectualSites/PlotSquared into 3.5.0 2016-07-24 17:45:34 -04:00
MattBDev
dda6849412 Fix sponge compile 2016-07-24 17:42:03 -04:00