EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-22 21:26:45 +01:00
Code Issues Projects Releases Wiki Activity
3,032 Commits 231 Branches 71 Tags 86 MiB
427504fd7c
Commit Graph

538 Commits

Author SHA1 Message Date
dordsor21
b35221bf4f Fix crashing on chunk load (chunks are still empty though) 2018-12-20 12:23:49 +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
ffe5cddead 1.13.2 spigot dependancy 2018-12-20 01:05:10 +00:00
dordsor21
5aac7d07d2 Remove abstraction of BukkitSchematicHandler 2018-12-20 00:47:04 +00:00
dordsor21
ee6d52efa3 Update all legacy IDs 2018-12-20 00:43:47 +00:00
dordsor21
adc2d980f4 Clean up listeners for legacy versions 2018-12-19 23:49:35 +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
dordsor21
e7b25d3fc8 Update BukkitLocalQueue to new LegacyMappings 2018-12-19 18:46:30 +00:00
sauilitired
444222c7f9 Improve PlotBlock name matching 2018-12-19 18:36:50 +01: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
ccad0bced9 Progress. 2018-12-18 20:54:20 +01:00
sauilitired
fb7bcef05f 1.13 shizzle 2018-12-17 20:57:21 +01:00
sauilitired
152e9e0e90 Make it build. 2018-12-06 16:59:10 +01:00
sauilitired
4395ca06b4 Add @SuppressWarnings("unused") to listeners. 2018-11-15 00:12:12 +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
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
dordsor21
ea5ffbeb77 Cancel plot chat if message event is cancelled to allow for swear block/etc 2018-10-25 10:51:18 +01:00
dordsor21
9e9b21779c Add PlotChangeOwner Event 2018-09-19 16:57:33 +01:00
sauilitired
032484b0f5 Pull out duplicated method sub in BukkitPlayer 2018-08-20 12:15:03 +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
sauilitired
3c86531b58 * ;) 2018-08-19 22:21:42 +02:00
sauilitired
847ce7f20d (W.I.P) TeleportEntityWrapper as alternative to replicating entity wrapper 2018-08-19 22:18:58 +02:00
sauilitired
369ccb7c8d Prettify BukkitUtil 2018-08-10 20:54:17 +02:00
sauilitired
724fb34b1f Prettify BukkitMain 2018-08-10 20:46:38 +02:00
sauilitired
2898e9ae2b Fix error from refactoring 2018-08-10 20:30:05 +02: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
Speentie8081
be8172ce91 Assume spigot 1.13 if NumberFormatException is fired 2018-07-22 09:17:38 -05:00
Speentie8081
768e21d1b5 Update NBTFactory to support spigot 1.13 2018-07-22 09:09:39 -05:00
Speentie8081
bbee2debff Remove unneeded changes and add back support for 1.9 through 1.12 2018-07-21 10:32:38 -05:00
Speentie8081
d5b01aced2 Use MaterialData instead of block id and data for chunk generation 2018-07-21 00:15:13 -05:00
Speentie8081
f533efb2c8 Add support for spigot 1.13-pre7 2018-07-20 23:51:09 -05:00
Josh
d673537026
fix dispensers 
previously dispensers were not working at all, this change blocks lava and water and allows dispensers to function normally again on servers with plotsquared. if you were trying to block dispensers launching items into the road however that still is not blocked by this
 2018-07-20 19:23:39 -04:00
Jesse Boyd
5d04c64d48
Fix typo 2018-07-07 09:11:23 +10:00
Jesse Boyd
185fe39942
Fix check for UUID support 2018-07-07 08:50:43 +10:00
Jesse Boyd
79e1ea9a8f
* 2018-06-23 14:13:06 +10:00
Jesse Boyd
1772fdab16
Fixes #1988 2018-06-23 14:12:21 +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
3039331976
Add account age expiry filter 2018-06-19 03:29:14 +10:00
Jesse Boyd
37b0cdeace
Revert "Don't cancel chat event" 
This reverts commit dc5fc5af47.
 2018-06-10 19:35:34 +10:00
Jesse Boyd
dc5fc5af47
Don't cancel chat event 2018-06-09 05:45:25 +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
d6c472fcdf
Fixes #1484 2018-05-17 16:23:27 +10:00
Jesse Boyd
a83b51eb12
Fixes #1951 2018-05-17 15:21:53 +10:00
Jesse Boyd
f479a70594
Fixes #1729 2018-05-17 15:11:44 +10:00
Jesse Boyd
9f9527d2e2
Fixes #1784 2018-05-17 14:53:34 +10:00
Jesse Boyd
98b7a84119
Fixes #1483 2018-05-17 14:50:47 +10:00
Jesse Boyd
5cb94f3e45
Fixes #1928 2018-05-17 14:43:51 +10:00
Jesse Boyd
59e06c2319
Fixes #1929 2018-05-07 10:44:16 +10:00
Jesse Boyd
ef54775ca7
wtf, this has its own spawn reason, thanks spigot 
Fixes #1803
 2018-05-07 10:15:21 +10:00
Jesse Boyd
ef83b5a1b7
Fixes #1931 2018-04-28 09:28:55 +10:00
Jesse Boyd
9fe1e53d9d
Fix single generator biomes 2018-04-15 10:47:00 +10:00
Jesse Boyd
7f257e2bf3
* 2018-04-12 00:20:13 +10:00
Jesse Boyd
c5b332246e
Fix setblock npe 1.8 2018-04-11 23:41:09 +10:00
Jesse Boyd
3565e67137
Prevent entity portal use from plotworld 2018-03-18 09:28:23 +11:00
Jesse Boyd
b36d42811a
Fixes #1897 2018-03-12 17:26:40 +11:00
Jesse Boyd
c5d5b52df4
Tweak item drop check 2018-02-08 19:42:36 +11:00
Jesse Boyd
4b50276ba0
Fixes #1844 2018-01-31 13:05:11 +11:00
Jesse Boyd
8815c83ba1
Various minor 
Teleport on login fixes
World unloading fixes
 2018-01-27 16:26:09 +11:00
Jesse Boyd
bc8b2af164
Fixes #1774 (backwards compatibility) 2018-01-10 17:06:35 +11: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
3779b17720 fix: shulker-teleport in a other plot (#1774) 
- shulker-teleport in a other plot (Fixes #1762)
 - dropper can't drop lava_bucket and water_bucket  (Fixes #1775)
 2017-12-03 17:21:15 +01:00
Jesse Boyd
734c4bb5fe
Fix vehicle deletion 2017-11-14 17:24:02 +11:00
Jesse Boyd
6b7adcdf34
Merge branch 'master' of https://github.com/IntellectualSites/PlotSquared 2017-11-14 17:10:05 +11: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
Opachl
c281620d75
Update PlayerEvents.java 
added missing import
 2017-11-12 17:49:14 +01:00
Opachl
c3f93a1960 fix: Interaction flag with item_frame 
Interaction flag with item_frame #1761
 2017-11-12 17:36:58 +01:00
Opachl
b4e8d782a1 Revert "fix: nteraction flag with item_frame" 
This reverts commit a2eb727e25.
 2017-11-12 17:35:59 +01:00
Opachl
a2eb727e25 fix: nteraction flag with item_frame 
nteraction flag with item_frame #1761
 2017-11-12 17:34:50 +01:00
Jesse Boyd
6e841543b8
Closes #1731 2017-11-09 10:57:17 +11:00
Jesse Boyd
534d627b05
Fixes #1732 2017-11-09 10:18:52 +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
Alexander Söderberg
530803c738 Implement VehicleMoveEvent for Bukkit. This fixes #1754. It also makes sure that you cannot use 
vehicles to enter plots that you're denied from.
 2017-11-06 22:01:18 +01:00
Jesse Boyd
5b6d5664e4
Fix fireworks being spawnable in other plots 2017-11-03 06:58:57 +11: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
abfbeffbb0
Skip y=255, block when finding a free spot 2017-09-23 15:09:03 +10:00
Jesse Boyd
31908090b8
Buld height check 2017-09-23 14:07:52 +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
24b3b60983
Might fix #1704 2017-09-01 23:11:37 +10:00
Jesse Boyd
538e2a6002
Varios 
Fixes #1697
Fixes #1689
 2017-08-18 12:37:26 +10:00
Jesse Boyd
da51be20a3
Fix compile 2017-08-10 16:55:57 +10:00
Jesse Boyd
c3759f8963
Fixes #1672 2017-08-10 16:46:51 +10:00
Jesse Boyd
c36ef1d237
Fixes #1673 
+ unrelated plotme conversion fix
 2017-08-10 16:35:53 +10:00
Jesse Boyd
cc1324f581
Fixes #1682 2017-08-09 15:45:27 +10:00
Jesse Boyd
b924809c91
Fixes #1608 2017-08-03 23:13:04 +10:00
Jesse Boyd
355e16fe92
Ignore searching top block for teleportation 2017-06-09 17:43:46 +10:00
Jesse Boyd
ddfcc5b077
Player login tweaks 2017-04-10 09:06:44 +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
a015039dad
Fixes #1535 
Set `misc_spawn_unowned`
 2017-03-13 18:36:40 +11:00
Jesse Boyd
a0640a1e66
Fixes #1536 2017-03-13 18:12:38 +11:00
Jesse Boyd
4d4950090d
Fix 1.7 block placer 2017-03-10 07:07:50 +11:00
Jesse Boyd
aa7b770c03
tweak highest block check 2017-01-31 16:45:02 +11:00
Jesse Boyd
35ebc8c830
Permission check fix 2017-01-13 07:22:28 +11:00
Jesse Boyd
686a6c499f
Fixes #1502 2017-01-11 07:53:53 +11:00
Jesse Boyd
15d4b6d34b
Bump spigot version 2016-12-29 07:23:51 +11:00
Jesse Boyd
6ec96870c0
Fix SO 2016-12-23 15:33:19 +11:00
Jesse Boyd
9fc464e896
Shorter border teleportation 2016-12-10 00:44:42 +11:00
Jesse Boyd
72ab10c079
remove debug 2016-12-03 23:08:10 +11:00
Jesse Boyd
f50d32f06b
* 2016-12-02 17:17:16 +11:00
Jesse Boyd
6cc744a2e6
Fixes #1444 2016-12-02 17:16:19 +11:00
Jesse Boyd
7e34d9e20a
Fix title logic 2016-11-30 21:26:52 +11:00
Jesse Boyd
c891abce09
Allow added players to use frost walker 
Properly fixes #1438
 2016-11-30 20:46:48 +11:00
Jesse Boyd
2b561f2efa
Rename to ice-form 2016-11-30 19:06:03 +11:00
Jesse Boyd
dea0a452df
Add fading 1.11 titles 2016-11-30 16:28:50 +11:00
Jesse Boyd
81418b07a8
Fixes #1438 (unless other things call this event) 2016-11-30 16:15:20 +11:00
Jesse Boyd
a3c1ad3ec8
Fixes #1449 2016-11-30 16:10:08 +11:00
Jesse Boyd
2e23ae0811
Fixes #1243 2016-11-30 16:00:47 +11:00
Jesse Boyd
7a1417dc56
Fixes #1415 2016-11-30 15:45:28 +11:00
Jesse Boyd
e7fa9e01be
Fixes #1419 2016-11-30 15:43:23 +11:00
Jesse Boyd
93414d54c1
Fixes #1453 2016-11-30 15:41:08 +11:00
Jesse Boyd
5642fd3899
Fixes #1359 
plots.chat.color
and
PLOT_CHAT_SPY_FORMAT
 2016-11-30 15:36:13 +11:00
Jesse Boyd
f3d950f6e1
Fix flame enchant damaging entities 2016-11-30 15:03:48 +11:00
MattBDev
8edc357d01 Fixed #1448 2016-11-27 01:26:06 -05:00
MattBDev
77281017d4 Fixes #1428 , Fixes #1431 2016-11-20 22:24:27 -05:00
Jesse Boyd
93c4854454
Add misc-interact flag 2016-10-18 05:03:14 +11:00
Jesse Boyd
5ed2190cb3 Fixes #1369 2016-09-30 23:32:49 +10:00
Jesse Boyd
cd2b6c8ccc Fixes #1379 2016-09-30 17:04:06 +10:00
Jesse Boyd
6f2c7de0ff Minor fix to conversion 2016-09-30 16:46:10 +10:00
Jesse Boyd
62373c0737 * 2016-09-30 16:15:15 +10:00
Jesse Boyd
499120963a Streamline PlotMe conversion 
Use reflection to disable PlotMe and forward DefaultGenerator to
PlotSquared
Fix border material copying from plotme config
You no longer need to delete the PlotMe jar for conversion
Fix some outdated messages
 2016-09-30 16:14:35 +10:00
Jesse Boyd
6074fc8033 Nukkit generator fixes 2016-09-30 14:26:20 +10:00
Jesse Boyd
e4d7270c28 Fix some merged plot events 2016-09-30 03:30:34 +10:00
Jesse Boyd
b6df07f723 Add snow-form flag 2016-09-27 01:38:59 +10:00
Jesse Boyd
177b33154f Multiple 
Fixes #1362
Fixes border id for PlotMe converter
 2016-09-27 00:56:39 +10:00
Jesse Boyd
12f8861d07 Various 
externalize strings
plotme conversion fixes
 2016-09-26 18:31:08 +10:00
Jesse Boyd
61022b717a Fixes #1360 2016-09-21 13:42:59 +10:00
Jesse Boyd
9e5af7a642 Possible fix for redstone in merged plots 2016-09-20 23:49:22 +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
8e7e5dcb25 Cleanup 
Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-14 12:16:22 -04:00
MattBDev
b6dac54677 Code cleaning and Gradle Update 
Updated gradle wrapper to 3.0
Updated Gradle files for Nukkit
Added/cleaned minor Nukkit code
Removed duplicate TitleManagement code

Signed-off-by: MattBDev <mattbdev@outlook.com>
 2016-09-13 18:10:01 -04:00
Jesse Boyd
a95b68b73c Add villager-interact flag 2016-09-09 15:17:37 +10:00
Jesse Boyd
85ff8bf639 Minor tweaks 2016-09-07 00:28:01 +10:00
Jesse Boyd
0557671b80 Recover from third party generator error 2016-09-04 14:22:01 +10:00
Jesse Boyd
d75ab130da Sponge fixes 2016-09-02 15:58:24 +10:00
Jesse Boyd
6a12a6ba64 print chat to console 
Fixes #1339
 2016-09-02 15:47:19 +10:00
manuelgu
20250bc989 Might resolve #1331 
Wasn't able to reproduce the issue
 2016-08-28 20:14:58 +02:00
Jesse Boyd
90d48b2cd0 Fixes #1289 2016-08-26 13:54:22 +10:00
Jesse Boyd
61d00e51ef Fixes #1303 2016-08-26 03:02:50 +10:00
Jesse Boyd
b5349e16f0 Fixes #1305 
Just teleports the player further back
Combine move/tp since tp extends move
 2016-08-26 02:31:50 +10:00
Jesse Boyd
a801127036 Merge pull request #1301 from MisterErwin/master 
Calling events when players are removed from plots & correct calling of Member & Trusted events
 2016-08-26 02:02:40 +10:00
Byteflux
98d0819383 Only show blocked-cmds message when event is cancelled 2016-08-16 19:09:02 -07:00
Jesse Boyd
e4408d56ec *And this 2016-08-16 14:32:31 +10:00
Jesse Boyd
f07ac646f3 Possible fix for greeting spam 2016-08-15 09:31:03 +10:00
MattBDev
63d4476d97 Fix #1181 2016-08-09 12:40:38 -04:00
Alex
634802ef98 Got rid of that auto-optimize-imports option 2016-08-08 23:20:31 +02: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
112da17614 Squashed commit of the following: 
commit 91c78407cd
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 11:29:59 2016 +1000

    Use a queue for expiry

commit 395d6364be
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 04:43:41 2016 +1000

    Cache on fail as well

commit facd43700d
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 04:00:50 2016 +1000

    Cache entity count every second

commit 1ae694ff5b
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sun Aug 7 03:52:37 2016 +1000

    Tweak entity counting

commit c99dd1e74a
Author: Jesse Boyd <jessepaleg@gmail.com>
Date:   Sat Aug 6 00:10:11 2016 +1000

    Needs sponge builds

commit f408ac82be
Author: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Date:   Fri Aug 5 12:13:39 2016 +0200

    Update README.md

commit 9b95990ba6
Author: Alexander Söderberg <Sauilitired@users.noreply.github.com>
Date:   Thu Aug 4 16:50:37 2016 +0200

    Update this here as well
 2016-08-08 14:02:25 -04:00
MattBDev
ea3306d070 Fix #1034 2016-07-31 20:17:35 -04:00
MattBDev
09994724db Fix #1277 2016-07-29 21:40:02 -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
adc021109f Added Polar Bear where missing 2016-07-25 22:25:15 -04:00
Jesse Boyd
0b5177f192 Minor uuid cache changes 2016-07-25 22:23:49 -04:00
Jesse Boyd
07dc6a46fb Remove metrics depend 2016-07-25 22:23:19 -04:00
Jesse Boyd
4e019ab796 UUID cache changes 2016-07-25 22:23:19 -04:00
Jesse Boyd
770b9be160 Minor uuid cache changes 2016-07-25 09:23:20 +10:00
Jesse Boyd
14b2b11bf3 Remove metrics depend 2016-07-25 08:09:57 +10:00
Jesse Boyd
07977ac2ce UUID cache changes 2016-07-25 07:44:47 +10:00
MattBDev
85d6e42462 Merge branch '3.4.5' of https://github.com/IntellectualSites/PlotSquared into 3.5.0 2016-07-24 17:27:41 -04:00
manuelgu
98e865cdf0 Make debug output useful 2016-07-23 12:50:39 +02:00
MattBDev
c1d4c481fb Fix #1244 2016-07-17 23:20:31 -04:00
MattBDev
8538170cba Metrics 2016-07-16 22:51:49 -04:00
Jesse Boyd
e2c57cea52 . 2016-07-12 23:56:59 +10:00
MattBDev
8b0e59209c Remove getServerName() 2016-07-05 23:43:08 -04:00
MattBDev
cf5d2a5e86 Entity Fix and Gradle changes 2016-07-01 17:13:49 -04:00
Jesse Boyd
b9ad75ad84 Add teleport flag 2016-06-29 21:22:55 +10:00
Jesse Boyd
185352d3cf Fixes #1229 2016-06-29 15:23:10 +10:00
Jesse Boyd
f4fe762135 * 2016-06-28 20:21:50 +10:00
Jesse Boyd
06682b18a5 Fix compile 
Recover on unknown command error
Fixes #1224
Close #1213 (fixed elsewhere)
Fixes #1212
 2016-06-28 19:55:51 +10:00
Jesse Boyd
f8e97f14d6 Fix end crystal spawn cap 2016-06-28 02:03:23 +10:00
MattBDev
a579df00db Merge remote-tracking branch 'origin/master' 2016-06-27 10:14:28 -04:00
Jesse Boyd
817a5bc16e Various 
Fix compatibility with bukkit 1.5
Recover on failed fancy message initialization
Fix /2 remove *
 2016-06-27 18:38:14 +10:00
Jesse Boyd
7da0b9877f Fixes #1221 (the NPE at least) 2016-06-26 17:07:46 +10:00
Jesse Boyd
f20ef15774 Revert creature spawn message + change expire to seen 2016-06-26 04:30:12 +10:00
MattBDev
5b9dc59abf Updates to docs, code style tweaks, and some code optimizations 2016-06-23 20:12:17 -04:00
MattBDev
30d49880b6 Fix #1208 NPE 2016-06-22 16:31:04 -04:00
Jesse Boyd
9e1f6d8748 Closes #1209 2016-06-22 13:33:32 +10:00
Jesse Boyd
e08db3d12b Check teleportation on command location prefix 2016-06-21 03:02:41 +10:00
Jesse Boyd
3fabfa10d7 Add liquid-flow flag 2016-06-20 22:48:04 +10:00
Jesse Boyd
f5e7d08ace Allow duplicates after 5s 2016-06-19 16:14:13 +10:00
Jesse Boyd
3ced832b80 Fix biome stripes (whoops) 2016-06-18 13:15:50 +10:00
Jesse Boyd
91c742c141 Fixes #590 2016-06-18 13:13:36 +10:00