AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-02 12:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

this is what happens when you force push

Browse Source
This commit is contained in:
Robinson Gallego
2019-11-03 17:40:58 -05:00
parent db42985743
commit 233632eaf1
5 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/me/totalfreedom/totalfreedommod/TotalFreedomMod.java
View File

@ -127,10 +127,7 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
public MasterBuilderWorldRestrictions mbwr;
public SignBlocker snp;
public PlayerVerification pv;
<<<<<<< HEAD
//public HubWorldRestrictions hwr;
=======
>>>>>>> d582398f932330853b0456b684654da4c860e831
//
// Bridges
public ServiceManager<TotalFreedomMod> bridges;
@ -205,11 +202,7 @@ public class TotalFreedomMod extends AeroPlugin<TotalFreedomMod>
as = services.registerService(AntiSpam.class);
mbl = services.registerService(MasterBuilderList.class);
mbwr = services.registerService(MasterBuilderWorldRestrictions.class);
<<<<<<< HEAD
//hwr = services.registerService(HubWorldRestrictions.class);
=======
>>>>>>> d582398f932330853b0456b684654da4c860e831
pl = services.registerService(PlayerList.class);
sh = services.registerService(Shop.class);
an = services.registerService(Announcer.class);