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

685 Commits

Author SHA1 Message Date
sauilitired
f4140ae728 Add getBlockArray() method 2018-12-20 21:40:50 +01:00
dordsor21
4e10682748 A few minor fixes 2018-12-20 18:46:52 +00:00
sauilitired
096ad1febe Make sure that blocks are actually compiled. Whoopsie 🐮 2018-12-20 19:35:02 +01:00
dordsor21
1543ac50cd Various: 
- Empty StringPlotBlocks are air
 - Update signs to 1.13
 - Fix getting material in BukktiLocalQueue#setMaterial
 2018-12-20 17:20:13 +00:00
sauilitired
568b4c8e85 Merge remote-tracking branch 'origin/breaking' into breaking 
# Conflicts:
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
 2018-12-20 02:25:55 +01:00
sauilitired
e939b8237e Changelist: 
- Added aliases for custom configuration types
- Removed numerical ID based methods in Block Queues
- Fixed sign removal in Plot.java
- (Hopefully) fixed dividing by 0 errors in BlockBucket
- Removed random from some methods, as blockbucket has it's own random
- Temporarily removed chunk analysis
- Changed a lot in GenChunk and BukkitPlotGenerator
 2018-12-20 02:23:48 +01:00
dordsor21
cbc2b70336 Merge commit 'be485075993f8dc807595c524f58c3bb58156a0c' into breaking 
# Conflicts:
#	README.md
 2018-12-20 00:55:44 +00:00
dordsor21
11ccfe7ac4 Reformat code 2018-12-19 23:26:20 +00:00
dordsor21
fa2dbb2b89 Update to WorldEdit 7 (and WE7-compatible schematics, *hopefully keeping legacy*) 2018-12-19 23:18:57 +00:00
sauilitired
e724aa8caf Fix PlotItem. 2018-12-19 18:24:35 +01:00
sauilitired
8f23299e7d Use BlockBuckets everywhere. 2018-12-19 17:19:54 +01:00
dordsor21
361cc9e9f7 Remove old LegacyMappings class from Bukkit 
Add "fromAny" method
 2018-12-19 15:08:49 +00:00
dordsor21
531d8cc706
Merge branch 'breaking' into breaking 2018-12-19 14:54:32 +00:00
dordsor21
4b02bb1df8 Refactor legacy mappings to use PlotBlocks 2018-12-19 14:52:15 +00:00
sauilitired
1d3270d869 BlockBuckets r cool 🐮 2018-12-19 00:01:13 +01:00
sauilitired
af9418552a Whoops. 2018-12-18 20:58:52 +01:00
sauilitired
10b87f5728 Add mappings for pre initialized items 2018-12-18 20:56:55 +01:00
sauilitired
ccad0bced9 Progress. 2018-12-18 20:54:20 +01:00
sauilitired
fb7bcef05f 1.13 shizzle 2018-12-17 20:57:21 +01:00
NotMyFault
8ad75efa0e Adding French translation 2018-12-12 16:12:40 +01:00
sauilitired
820710721e Schematic list command 2018-12-06 18:01:33 +01:00
sauilitired
a4a923c23c Extract duplicated switch statement in EntityUtil 2018-11-15 00:08:32 +01:00
sauilitired
06f64aeff0 Extract duplicated method declaration 2018-11-15 00:06:20 +01:00
sauilitired
a8b4729845 Rename DBFunc#everyone to DBFunc#EVERYONE, and create two string constants 🐱 2018-11-14 23:51:56 +01:00
sauilitired
3c64376abe Fix guest gamemode flag. 2018-11-14 23:40:27 +01:00
dordsor21
8cd54929e7 Merge branch 'master' into breaking 
# Conflicts:
#	Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/events/PlotRateEvent.java
#	Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEventUtil.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotSquared.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Add.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Auto.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Delete.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Kick.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Load.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Music.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Owner.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Rate.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Reload.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/SchematicCmd.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/commands/Trust.java
#	Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/GameModeFlag.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Clear.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/PluginCmd.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/Relight.java
#	Core/src/main/java/com/intellectualcrafters/plot/commands/SetHome.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/C.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/Configuration.java
#	Core/src/main/java/com/intellectualcrafters/plot/config/Settings.java
#	Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventUtilTest.java
#	Nukkit/src/main/java/com/plotsquared/nukkit/util/NukkitEventUtil.java
#	README.md
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/events/PlotRateEvent.java
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/SpongeSchematicHandler.java
#	Sponge/src/main/java/com/github/intellectualsites/plotsquared/sponge/util/block/SpongeLocalQueue.java
#	Sponge/src/main/java/com/plotsquared/sponge/util/SpongeEventUtil.java
 2018-11-14 14:44:07 +00:00
sauilitired
8df7f63931 Refactor PS (and rename to PlotSquared) 2018-11-14 14:19:57 +01:00
sauilitired
16dbbe5244 Refactoring of PS#getPlots: 
Initialize to HashSet rather than ArrayList, because of add in HashSet
is O(1) vs. add in ArrayList which is O(n). Also make the wrapping
set immutable.
 2018-11-14 13:52:09 +01:00
NotMyFault
ae2869a29b Translation update and fixing wrong lines 2018-11-05 16:00:44 +01:00
NotMyFault
302051a6ca Minor cleanup 2018-10-20 14:03:21 +02:00
Jesse Boyd
b6d4872ca4
Merge pull request #2102 from dordsor21/master 
Add PlotChangeOwner Event
 2018-10-13 15:11:45 +11:00
NotMyFault
4b7ca2ff37
Minor cleanup 2018-10-10 18:29:21 +02:00
NotMyFault
1734c0e357
Rename ko_KR.yml to ko-KR.yml 2018-10-10 16:52:35 +02:00
NotMyFault
e2e34f24d6
Rename zh_CN.yml to zh-CN.yml 2018-10-10 16:51:43 +02:00
NotMyFault
765db2df0c
Added languages 'back' 2018-10-10 16:49:31 +02:00
NotMyFault
e1e6d95f75
Merge pull request #2049 from f0rb1d/master 
Updated Simplified Chinese translation and formalized language codes.
 2018-10-10 16:40:52 +02:00
NotMyFault
70584a338c
Update PS.java 2018-10-10 16:38:01 +02:00
NotMyFault
11e2777f60
Update PS.java 2018-10-10 16:36:14 +02:00
NotMyFault
b6303a7615
Update PS.java 2018-10-10 16:33:03 +02:00
NotMyFault
88e80f54f7
Updating locale names 2018-10-10 16:30:38 +02:00
dordsor21
9e9b21779c Add PlotChangeOwner Event 2018-09-19 16:57:33 +01:00
NotMyFault
979b3c0408
Added bridge template and korean translation 2018-09-03 00:04:32 +02:00
NotMyFault
5b2428559a
Bridge template from the spigot page 2018-09-03 00:02:07 +02:00
NotMyFault
f001eebad4
Update Settings.java 2018-09-02 23:51:45 +02:00
Jesse Boyd
f5a981fda7
Fix plot visit sorting 2018-08-24 06:47:16 +10:00
sauilitired
587c942d88 Suppress PlotAPI warnings 2018-08-20 11:36:59 +02:00
sauilitired
e98c648244 Move PlotAPI to Core and move bukkit specific methods to BukkitUtil. 2018-08-20 11:35:41 +02:00
sauilitired
be9fb3bd3a Remove deprecated methods without internal use. 2018-08-20 11:05:00 +02:00
sauilitired
01a927ccad Allow PlotRateEvent to be cancelled. Fixes #2017 2018-08-19 23:12:59 +02:00
Jesse Boyd
4b8c434669
Fix compile (var must be final) 2018-08-12 21:36:04 +10:00
sauilitired
b0348cfc34 Update packages. This will not be appreciated 🐱 2018-08-10 17:53:15 +02:00
sauilitired
1646cd0f5a Reformat code 2018-08-10 17:01:11 +02:00
Alexander Söderberg
bbcd508bc3
Remove unnecessary lines in Configuration javadoc 2018-08-10 16:04:43 +02:00
F0rb1d
a4f176fd07 Updated Simplified Chinese translation and formalized language codes. 2018-08-03 20:35:36 +08:00
Jesse Boyd
3d8d75170d
Check admin for setowner null 2018-07-31 14:28:22 +10:00
Jesse Boyd
2c11a292f4
Prevent multiple uses of plot auto 2018-07-29 21:43:07 +10:00
Jesse Boyd
cd9d22cb9b
Fix augmented generator not clearing column 2018-07-27 14:02:40 +10:00
Jesse Boyd
645c5fb529
Fix nukkit augmented generator 2018-07-27 13:25:46 +10:00
Jesse Boyd
ae1e58c0ac
Add -f override for plot move 2018-07-07 09:22:24 +10:00
Jesse Boyd
18c92bea38
Allow specifying area for move command 2018-07-05 19:33:17 +10:00
Jesse Boyd
9020d740d1
Revert "possible fix for mob damage" 
This reverts commit df6914fb1e.
 2018-06-23 11:46:19 +10:00
Jesse Boyd
df6914fb1e
possible fix for mob damage 2018-06-21 07:48:45 +10:00
Jesse Boyd
da5478f141
Only check int flag ranges 2018-06-20 07:48:51 +10:00
Jesse Boyd
d454602888
Fixes #1961 2018-06-19 03:44:45 +10:00
Jesse Boyd
3039331976
Add account age expiry filter 2018-06-19 03:29:14 +10:00
Jesse Boyd
6ed6f607b5
Sort flag list alphabetically 2018-06-13 09:28:32 +10:00
Jesse Boyd
ce3e3be59e
Tweak nukkit plot chat 2018-06-09 15:37:49 +10:00
Jesse Boyd
740de4932b
Fix flag perm check 2018-06-07 12:30:39 +10:00
Jesse Boyd
442513b592
Fixes #1970 2018-06-07 08:15:28 +10:00
Jesse Boyd
40635255e3
Probably fixes #1953 2018-05-18 14:48:17 +10:00
Jesse Boyd
550df7f232
Fixes #1952 2018-05-17 17:46:54 +10:00
Jesse Boyd
4ffc4e67ab
Fixes #1822 2018-05-17 16:30:31 +10:00
Jesse Boyd
d6c472fcdf
Fixes #1484 2018-05-17 16:23:27 +10:00
Jesse Boyd
67a70d4ade
Fixes #1928 2018-05-17 15:17:45 +10:00
Jesse Boyd
9f9527d2e2
Fixes #1784 2018-05-17 14:53:34 +10:00
Jesse Boyd
ecf94b8706
minor web tweaks 2018-05-13 10:32:48 +10:00
NotMyFault
244ccb71cf
Update of german.yml 
german.yml design has been reworked to the up-to-date PlotSquared language file design. Many lines were added and adjusted.
 2018-05-11 20:37:50 +02:00
NotMyFault
e13785edfe
Typo fixes 
Had to write some custom messages for a server and fixed the typos in here
 2018-05-11 00:03:35 +02:00
Jesse Boyd
d49bfa612e
Merge pull request #1933 from Leomixer17/patch-1 
Update italian.yml
 2018-05-02 00:52:53 +10:00
Jesse Boyd
72f30d8aef
usernames can be 2 characters 2018-05-02 00:43:27 +10:00
Leomixer17
ef6b1cb932
Update italian.yml 2018-05-01 01:29:18 +02:00
Jesse Boyd
154bad6188
* 2018-04-28 21:53:39 +10:00
Jesse Boyd
613d79fb39
Fixes #1691 2018-04-28 21:51:26 +10:00
Jesse Boyd
5f9bd853ec
Fixes #1903 2018-04-28 09:41:09 +10:00
Jesse Boyd
ef83b5a1b7
Fixes #1931 2018-04-28 09:28:55 +10:00
Jesse Boyd
4f63cdf560
Fixes #1920 2018-04-13 20:37:28 +10:00
Foorack
90c3fac4fa Fix PlotVersion when compiling with Maven 2018-04-07 20:52:19 +02:00
bibo38
fb706e0d60 Fixed wrong newlines in german language file 2018-03-16 18:07:29 +01:00
Jesse Boyd
368b9a0168
Fixes #1786 2018-03-15 16:34:28 +11:00
BrainStone
515405aa9e using newer MySQL driver 
- Newer driver doesn't need manual loading
- Fixes #1783
 2018-03-10 21:34:11 +01:00
Jesse Boyd
8f5e2eb439
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2018-03-08 08:37:36 +11:00
Jesse Boyd
5b18b918a9
Ignore unsupported statement isClosed 2018-03-08 08:37:17 +11:00
dordsor whitwell
7dcb85d5d4
Fix typo in database update error message 2018-03-07 21:02:19 +00:00
Jesse Boyd
1cd30b84d5
check for closed connections 2018-02-15 23:12:42 +11:00
Jesse Boyd
eb1c3263ec
Fix deny-exit flag 2018-02-15 18:59:40 +11:00
Jesse Boyd
8815c83ba1
Various minor 
Teleport on login fixes
World unloading fixes
 2018-01-27 16:26:09 +11:00
Jesse Boyd
0e183f5627
Fixes #1839 2018-01-13 12:47:02 +11:00
Jesse Boyd
b239cb4a18
Fixes #1828 2018-01-10 17:50:38 +11:00
Jesse Boyd
4f464439e5
* 2018-01-10 17:22:46 +11:00
Jesse Boyd
4716104951
Revert broken changes to visit 2018-01-10 17:15:05 +11:00
Jesse Boyd
03337fe080
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2018-01-10 16:58:42 +11:00
Jesse Boyd
4ff02831f3
Fixes #1767 (performance issue) 2018-01-10 16:58:37 +11:00
Jesse Boyd
09e83bcbf8
Merge pull request #1793 from Leomixer17/patch-3 
Update italian.yml
 2018-01-10 16:50:17 +11:00
Jesse Boyd
5ddefcea22
when PlayerQuitEvent is never called 2018-01-04 19:24:00 +11:00
Leomixer17
47314ce00d
Update italian.yml 2017-12-10 15:28:35 +01:00
Leomixer17
452bf593e0
Update italian.yml 2017-12-10 14:35:43 +01:00
Leomixer17
a9bd6566b7
Update italian.yml 2017-12-10 12:53:22 +01:00
Christian Langel
59557cf889 improvements: Message for visit Command to a players without plots (#1796) 
We provide now a clear message if we are sure that the Visit command means a player but we dont found any claimed plots for this player.

This is helpful if we try teleport to  a numeric named player

See this related tickets: #1691, #1778
 2017-12-09 11:08:15 +01:00
Leomixer17
48bdfd75e5
Update italian.yml 2017-12-07 19:50:02 +01:00
Opachl
70a82d9fc6 fix: p visit issue in latest builds 
p visit issue in latest builds #1791
 2017-12-06 21:40:26 +01:00
Leomixer17
61e045aa50 Update italian.yml (#1789) 2017-12-04 17:02:11 +01:00
Leomixer17
9daf13c897
Update italian.yml 2017-12-03 21:13:39 +01:00
Christian Langel
7d39d09317 fix: remove plot-alias with "/p alias" (#1779) 
* fix: remove plot-alias with "/p alias"

remove plot-alias with "/p alias" #1718

* Apply requested Review Changes

Restored the original Permisson to keep backwards compatibility
Clean unused imports.

* added some improvements after testing

added some improvements after testing
 2017-12-03 17:59:36 +01:00
Christian Langel
06208696db fix: numeric Playernames thows NumberFormatException on Teleport (#1778) 
* fix: numeric Playernames thows NumberFormatException on Teleport

Refactoring of the Teleport Handling

Supports now:
     * p h xPlotPlayerGuy [PAGE] = Player  [numeric] [alphanumeric]
     * p h MyPlantage      [PAGE] = Alias    [numeric] [alphanumeric]
     * p h PlotworldLarge [PAGE] = World  [numeric] [alphanumeric]
     * p h 1:1		       [PAGE] = plotId  [numeric (1,1|1;2) ]
     * p h 4		                   = 4 th Plot of the Player if available  [numeric (1,1|1;2) ]
Check order: Player, Alias, World, PlotId, Page [PAGE]
[PAGE] is optional

* Apply suggested Code Style

Changes:
Collections now empty instead of null.
Property renaming
 2017-12-03 17:15:09 +01:00
Opachl
9413ce0880 fix: no wether update after "/p flag remove weather" 
no wether update after "/p flag remove weather" #1723
 2017-11-15 11:14:14 +01:00
Jesse Boyd
a752780eeb
Minor fixes 
Update message color
CME on plot action
Creative middle click banner/head
 2017-11-14 17:09:51 +11:00
Jesse Boyd
6e9c103b55
Fix typo 2017-11-12 13:32:09 +11:00
Jesse Boyd
fe534bccbe
Merge pull request #1753 from Leomixer17/patch-1 
Improved italian translation
 2017-11-09 10:16:37 +11:00
Jesse Boyd
37f1da0715
Various minor 
VehicleMoveEvent
- Move KillRoadVehicles code there
- Fix for pre-1.12
Fix auto merge being disabled
 2017-11-09 10:15:16 +11:00
Leomixer17
faa24bbdf4
Update italian.yml 2017-11-04 21:36:03 +01:00
Jesse Boyd
22429fc3e0
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2017-10-31 23:26:18 +11:00
Jesse Boyd
7e2a911530
Closes #1750 2017-10-31 23:26:08 +11:00
Jesse Boyd
7b04ec9ff3
Merge pull request #1746 from Gabscap/fix-location_equals 
Fix Location.equals
 2017-10-29 21:08:58 +11:00
Jesse Boyd
097159d606
Fix wrong sign height 2017-10-23 18:23:37 +11:00
Gabscap
04bfe73c29 Fix Location.equals 2017-10-20 14:23:35 +02:00
Jesse Boyd
d4614007ae
Fixes #1743 2017-10-14 20:52:35 +11:00
Jesse Boyd
9480c70655
Save world before download 2017-09-30 00:28:39 +10:00
Jesse Boyd
8b6cc7a193
* 2017-09-29 23:23:40 +10:00
Jesse Boyd
0d608245f5
Some tweaks / optimizations 2017-09-25 16:57:42 +10:00
Jesse Boyd
92f94ecedc
Tweaks 
Use sign with plot schematic
Tweak world unloading
 2017-09-24 00:13:05 +10:00
Jesse Boyd
2360782234
* 2017-09-23 20:09:34 +10:00
Jesse Boyd
1d20ae2777
allow air 2017-09-23 19:28:40 +10:00
Jesse Boyd
6b55b8cd67
Allow configuring a separate nonmember home position 2017-09-23 19:10:57 +10:00
Jesse Boyd
c645c4a6cb
* 2017-09-23 18:20:27 +10:00
Jesse Boyd
8e55860f77
Center plot schematic 2017-09-23 16:25:28 +10:00
Jesse Boyd
d97ff94465
Various minor 
Fix download world spawnpoint
Fix regenallroads on augmented world
Ensure all chunks have unloaded before unloading a world
 2017-09-20 00:33:29 +10:00
Jesse Boyd
ce90b36d28
Wrap plot.schematic 2017-09-13 13:57:07 +10:00
Jesse Boyd
20d7a0eea2
Don't overwrite online player names from uuid cache 2017-09-06 19:49:57 +10:00
Jesse Boyd
17154ef1d5
idk why that wasn't working 2017-08-18 23:34:27 +10:00
Jesse Boyd
538e2a6002
Varios 
Fixes #1697
Fixes #1689
 2017-08-18 12:37:26 +10:00
Jesse Boyd
84a6a6daf4
Closes #1643 2017-08-10 17:24:59 +10:00
Jesse Boyd
a2324190bb
Fixes #1619 2017-08-10 17:18:35 +10:00
Jesse Boyd
af99c6a706
* 2017-08-10 17:15:03 +10:00
Jesse Boyd
c9cee8a4a8
Fixes #1504 2017-08-10 17:12:27 +10:00
Jesse Boyd
c808257b7c
Fixes #1668 2017-08-10 16:52:17 +10:00
Jesse Boyd
c36ef1d237
Fixes #1673 
+ unrelated plotme conversion fix
 2017-08-10 16:35:53 +10:00
Jesse Boyd
f49d43d6a3
Notify player when using an invalid purge argument 2017-08-10 16:11:50 +10:00
Jesse Boyd
ac9042bbe4
Various minor 
New plugin updater and versioning
In game changelog
fix login teleporting
 2017-08-09 15:05:13 +10:00
Jesse Boyd
a913983d99
Add plot leave 2017-07-25 06:39:59 +10:00
Jesse Boyd
3633576e03
Fix teleport for single plot worlds 2017-07-08 23:22:05 +10:00