Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Command /ctgstats need to be fixed #105

Open
wants to merge 101 commits into
base: master
Choose a base branch
from
Open

Command /ctgstats need to be fixed #105

wants to merge 101 commits into from

Conversation

MecLoving
Copy link

the command /ctgstats doesn't display the number or reinforcement in a group anymore. Instead, it displays the same information as /ctgroupinfo without the text format.

erocs and others added 30 commits February 1, 2013 22:44
@erocs
Rail protection from water/lava
5ec0fb5 
Inspired by https://github.com/remyroy/Citadel.git
@erocs
Remove development comment block
7935dc4
@erocs
Add Faction discipline flags
801c9ad
@erocs
Added permission nodes for ctgstats,ctpstats and the group node citad…
cbb66fb 
…el.admin
@erocs
Citadel permission updates
0ecb57a 
- Add /ctdiscipline and /ctremediate
- Remove ConsoleCommand handler
- Expose admin commands both in-game and to the console
- Break the PlayerReinforcement->Faction dependency
@erocs
Fix NPE
522a2b2
@erocs
Add additional admin overrides
ccd3a04
@erocs
Fix Citadel to work nicely with Essentials
523aa0e
@fndragon
Added blockhandler to disallow placing signs above chest blocks if the
65bfd03 
user placing the sign is not allowed to access the chest below.  This
neatly solves the interaction with PhysicalShop.
@fndragon
Merged the listeners together so we only have one listener. Also added
2a5aace 
check for PhysicalShop
@rourke750
Update BlockListener.java
cb73175 
fix for 1.5 by cancelling block breaks for placing blocks with hoppers.
@rourke750
Update BlockListener.java
dfee4ae 
added stopping chest placement next to reinforced chests.
@erocs
Merge pull request #14 from fndragon/master
359ad41 
Update to eliminate chest thievery.
@erocs
Merge/refactor Rourke's cb73175 and dfee4ae
1255b61 
+ Fix whitespace
@erocs
Activate 1.5 specifics from 1255b61
9574ba7
@erocs
Merge branch 'master' of https://github.com/erocs/Citadel
451783e
@erocs
Merge branch 'master' into 1.5
7ceb1b2
@erocs
Only cancel /cti block click in creative mode
62c49bf
@erocs
Fixup whitespace
3cb5b31
@erocs
Always save default config.yml into plugins dir
37b3afe
@erocs
Make /ctgstats available to players
9d40752
@erocs
Prevent object growth from subverting reinforcements
b6ec3f0
@erocs
Remove dup code and fix left-over copy.
dad3351
@erocs
Determine securable by InventoryHolder superclass
b019ce1
@erocs
Support trapped chests
34b0ba4
@erocs
Merge branch '1.5'
078cf79 
Conflicts:
	plugin.yml
@erocs
Rev version to keep unique version for merged 1.5
d7223c9
@erocs
Add CreateReinforcementEvent
04854ac
@erocs
Fire CreateReinforcementEvent on /ctr owner change
73e1152
@erocs
Prevent rails under reinforced containers
f7781ae 
This is to prevent minecart hoppers from pulling items from reinforced
 containers.
erocs and others added 24 commits September 29, 2013 16:58
@erocs
Configurable verbose messages
1680502
@erocs
Update PlayerReinforcement to verify via Faction.isFounder
ce7e758
@erocs
Add DB versioning, update /ctdel for DB lag issue
0e41a20
@erocs
Improve acid block targeting
034d9c8
@erocs
Fix acid blocks w/ double chests, fix a couple format strings
5798cb9
@rourke750
Merge pull request #1 from erocs/master
7484f93 
um please dont let this be a fuck up
@rourke750
fixed bug where you could break invulnerable blocks
e0734f7
@rourke750
Update plugin.yml
9f1a9d6
@erocs
Add to non-reinforceables
cf59596
@erocs
Fix melon/pumpkin independent reinforcements
d2b40bc
@dquist
Fix group deletion on plugin start
8a154fd
@dquist
Add batch updating of reinforcement records
1268fbc 
Perform batch reinforcement updates for deleted groups and only deletes
groups if there are no more records to update for that group.
@dquist
Added config items
486629b 
the delete flag is explicitly checked now
@dquist
Fixed comments
79dcb36
@dquist
Update some comments and formatting
a8247be
@dquist
Update plugin.yml
4ddf8b6 
Increment version number
@dquist
restore loadDeletedGroups
5bc9c21
@ttk2
Merge pull request #1 from erocs/upstream
6309428 
Update to live version
@WildWeazel
updating build script for jenkins
8276780
@ttk2
Merge pull request #2 from WildWeazel/patch-1
5a88fe7 
updating build script for jenkins
@WildWeazel
java target because maven is dense
82c2030 
grumble grumble
@ttk2
Merge pull request #3 from WildWeazel/patch-1
17b0f00 
java target because maven is dense
@WildWeazel
use bukkit repo and java 6
eba4056
@ttk2
Merge pull request #4 from WildWeazel/patch-1
512e966 
use bukkit repo and java 6
@ttk2
Copy link
Collaborator

ttk2 commented Jul 19, 2014

first off this is the wrong repo, we are using mine for the time
being, second, I know the admin version of this command still shows
number of items so chances are someone got confused with how the
command was supposed to work for some people vs admins.

Also does this check that you own the group before giving you the info?

On 7/18/14, MecLoving [email protected] wrote:

the command /ctgstats doesn't display the number or reinforcement in a
group anymore. Instead, it displays the same information as /ctgroupinfo
without the text format.
You can merge this Pull Request by running:

git pull https://github.com/erocs/Citadel master

Or you can view, comment on it, or merge it online at:

#105

-- Commit Summary --

  • Rail protection from water/lava
  • Remove development comment block
  • Add Faction discipline flags
  • Added permission nodes for ctgstats,ctpstats and the group node
    citadel.admin
  • Citadel permission updates
  • Fix NPE
  • Add additional admin overrides
  • Fix Citadel to work nicely with Essentials
  • Added blockhandler to disallow placing signs above chest blocks if the
  • Merged the listeners together so we only have one listener. Also added
  • Update BlockListener.java
  • Update BlockListener.java
  • Merge pull request Forgot to include DelayedReinforcements.class #14 from fndragon/master
  • Merge/refactor Rourke's cb73175 and dfee4ae
  • Activate 1.5 specifics from 1255b61
  • Merge branch 'master' of https://github.com/erocs/Citadel
  • Merge branch 'master' into 1.5
  • Only cancel /cti block click in creative mode
  • Fixup whitespace
  • Always save default config.yml into plugins dir
  • Make /ctgstats available to players
  • Prevent object growth from subverting reinforcements
  • Remove dup code and fix left-over copy.
  • Determine securable by InventoryHolder superclass
  • Support trapped chests
  • Merge branch '1.5'
  • Rev version to keep unique version for merged 1.5
  • Add CreateReinforcementEvent
  • Fire CreateReinforcementEvent on /ctr owner change
  • Prevent rails under reinforced containers
  • Fix HopperCarts, add plant reinforcements
  • Add the idx_reinforcement_chunkid index
  • Remove extraneous StructureGrowEvent
  • Protect reinforced crops from water buckets
  • Owners can break reinforced crops
  • Add group caching
  • Crop auto-bypass also for group members
  • Merge branch 'master' into dev
  • Fix some group cache bugs
  • Add GroupChangeEvent
  • Fix another group cache bug
  • Fix GroupChangeEvent bug
  • Fix hoppers with double chests
  • Sugar cane grows on sand and grass
  • Reinforcement maturation and scaling
  • Add acid block, adjust /cti
  • Add /ctmature
  • Propagate maturation, prevent insta-acid
  • Scaled materials shouldn't break at scale unless immature
  • Async queries for stats commands
  • Implement PlayerDamageReinforcementEvent
  • Update version.
  • Merge branch 'dev'
  • Merge pull request ctremovereinforcements command doesn't work #46 from shadowjay1/master
  • Fix acid block when maturity is disabled
  • Merge branch 'dev' of github.com:erocs/Citadel into dev
  • Add license
  • Make ACTIVATOR_RAIL same as other rails
  • Don't display (Hardening) for /cti if not applicable
  • Make PlRein message info which is governed by verbose logging setting
  • Prevent reinforced wheat trampling
  • Add acid block reinforcement tax
  • Use PlayerInteract instead of BlockPhysics for preventing crop trample
  • Rev version
  • Unreinforced crops should break
  • Async /ctstats
  • Fix warnings
  • Fix issue with reinforcement materials and lore
  • Refactor InventoryMoveItemEvent, fix NPE, GRASS->LONG_GRASS
  • Relax the hopper ownership check a bit
  • Add support for insecure Hopper transfers
  • Fix reinforced dirt->crop transformation
  • Configurable verbose messages
  • Update PlayerReinforcement to verify via Faction.isFounder
  • Add DB versioning, update /ctdel for DB lag issue
  • Improve acid block targeting
  • Fix acid blocks w/ double chests, fix a couple format strings
  • Merge pull request Dynamite bug:  #1 from erocs/master
  • fixed bug where you could break invulnerable blocks
  • Update plugin.yml
  • Add to non-reinforceables
  • Fix melon/pumpkin independent reinforcements
  • Fix group deletion on plugin start
  • Add batch updating of reinforcement records
  • Added config items
  • Fixed comments
  • Update some comments and formatting
  • Update plugin.yml
  • restore loadDeletedGroups

-- File Changes --

D Citadel.jar (0)
A LICENSE.txt (11)
M bin/META-INF/MANIFEST.MF (4)
M config.yml (24)
M plugin.yml (52)
M src/com/untamedears/citadel/Citadel.java (174)
M src/com/untamedears/citadel/ConfigManager.java (104)
M src/com/untamedears/citadel/GroupManager.java (95)
M src/com/untamedears/citadel/GroupStorage.java (456)
M src/com/untamedears/citadel/MemberManager.java (2)
M src/com/untamedears/citadel/PlacementMode.java (6)
M src/com/untamedears/citadel/Utility.java (385)
M src/com/untamedears/citadel/access/AccessDelegate.java (50)
M src/com/untamedears/citadel/access/BedAccessDelegate.java (6)
M src/com/untamedears/citadel/access/ChestAccessDelegate.java (5)
A src/com/untamedears/citadel/access/CropAccessDelegate.java (52)
M src/com/untamedears/citadel/access/DoorAccessDelegate.java (7)
M src/com/untamedears/citadel/command/CommandHandler.java (87)
M src/com/untamedears/citadel/command/CommandUtils.java (17)
D src/com/untamedears/citadel/command/ConsoleCommand.java (75)
A src/com/untamedears/citadel/command/commands/AcidCommand.java (118)
M src/com/untamedears/citadel/command/commands/AddModCommand.java (12)
M src/com/untamedears/citadel/command/commands/AllowCommand.java (16)
M src/com/untamedears/citadel/command/commands/ConsoleCommands.java

(66)
M src/com/untamedears/citadel/command/commands/CreateCommand.java (7)
M src/com/untamedears/citadel/command/commands/DeleteCommand.java (21)
M src/com/untamedears/citadel/command/commands/DisallowCommand.java
(11)
A src/com/untamedears/citadel/command/commands/DisciplineCommand.java
(65)
M src/com/untamedears/citadel/command/commands/FortifyCommand.java (4)
M src/com/untamedears/citadel/command/commands/GroupCommand.java (4)
M src/com/untamedears/citadel/command/commands/GroupInfoCommand.java
(10)
M src/com/untamedears/citadel/command/commands/GroupStatsCommand.java
(89)
M src/com/untamedears/citadel/command/commands/GroupsCommand.java (16)
A src/com/untamedears/citadel/command/commands/InsecureCommand.java
(34)
M src/com/untamedears/citadel/command/commands/JoinCommand.java (11)
M src/com/untamedears/citadel/command/commands/LeaveCommand.java (12)
A src/com/untamedears/citadel/command/commands/MatureCommand.java (56)
M src/com/untamedears/citadel/command/commands/MembersCommand.java (4)
M src/com/untamedears/citadel/command/commands/ModeratorsCommand.java
(4)
M src/com/untamedears/citadel/command/commands/PasswordCommand.java
(11)
M src/com/untamedears/citadel/command/commands/PlayerStatsCommand.java
(110)
M src/com/untamedears/citadel/command/commands/ReinforceCommand.java
(4)
M src/com/untamedears/citadel/command/commands/RemoveModCommand.java
(13)
A src/com/untamedears/citadel/command/commands/ReprieveCommand.java
(49)
M src/com/untamedears/citadel/command/commands/StatsCommand.java (45)
M src/com/untamedears/citadel/command/commands/TransferCommand.java
(24)
M src/com/untamedears/citadel/dao/CitadelCachingDao.java (28)
M src/com/untamedears/citadel/dao/CitadelDao.java (276)
A src/com/untamedears/citadel/entity/DbVersion.java (37)
M src/com/untamedears/citadel/entity/Faction.java (103)
A src/com/untamedears/citadel/entity/FactionDelete.java (38)
M src/com/untamedears/citadel/entity/FactionMember.java (15)
M src/com/untamedears/citadel/entity/IReinforcement.java (2)
M src/com/untamedears/citadel/entity/Moderator.java (15)
M src/com/untamedears/citadel/entity/NaturalReinforcement.java (8)
M src/com/untamedears/citadel/entity/PlayerReinforcement.java (132)
A src/com/untamedears/citadel/events/CreateReinforcementEvent.java (76)
A src/com/untamedears/citadel/events/GroupChangeEvent.java (64)
A src/com/untamedears/citadel/events/GroupChangeType.java (10)
A src/com/untamedears/citadel/events/PlayerDamageReinforcementEvent.java
(57)
M src/com/untamedears/citadel/listener/BlockListener.java (367)
M src/com/untamedears/citadel/listener/EntityListener.java (18)
A src/com/untamedears/citadel/listener/InventoryListener.java (145)
M src/com/untamedears/citadel/listener/PlayerListener.java (270)
A src/com/untamedears/citadel/listener/WorldListener.java (26)

-- Patch Links --

https://github.com/Exultant/Citadel/pull/105.patch
https://github.com/Exultant/Citadel/pull/105.diff

Reply to this email directly or view it on GitHub:
#105

Dr. Andrew Jawa and others added 5 commits August 13, 2014 12:56
Disable /ctgstats
6ba7787
Update plugin.yml
476160f
Update pom.xml
8141e7a 
Previous version was a bit out of date. Hopefully, this doesn't break anything...
@erocs
Merge pull request #71 from ttk2/master
ecedc5a 
Mainline POM changes for Jenkins
@erocs
Merge remote-tracking branch 'drjawa/master'
1feda4f 
Conflicts:
	pom.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@MecLoving @ttk2 @erocs @fndragon @rourke750 @shadowjay1 @dquist @WildWeazel